Switch to new ags

This commit is contained in:
Thomas Avé 2024-11-24 21:08:34 +01:00
parent 6c26e0a8b0
commit cbc805d0dc
10 changed files with 60 additions and 59 deletions

View File

@ -2,20 +2,38 @@
"nodes": {
"ags": {
"inputs": {
"nixpkgs": "nixpkgs",
"systems": "systems"
"ags": "ags_2",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1731591309,
"narHash": "sha256-2qL6CAoQjCJLsxpy0Ac/9pLFoItf3L9KMCSLpoJ6jSw=",
"lastModified": 1,
"narHash": "sha256-0veb/yDBkTJu1HzFZIcNcXIFaWPp+OTyWbe6aYmCWCQ=",
"path": "/nix/store/r73gq4az4lwgh699zxnhzhznjigylpbd-source/home/ags",
"type": "path"
},
"original": {
"path": "/nix/store/r73gq4az4lwgh699zxnhzhznjigylpbd-source/home/ags",
"type": "path"
}
},
"ags_2": {
"inputs": {
"astal": "astal",
"nixpkgs": [
"ags",
"nixpkgs"
]
},
"locked": {
"lastModified": 1732307740,
"narHash": "sha256-ZDsYdZOtg5qkK/wfLLB83B3SI+fE32S+/6Ey0ggHODM=",
"owner": "aylur",
"repo": "ags",
"rev": "67b0e31ded361934d78bddcfc01f8c3fcf781aad",
"rev": "81159966eb8b39b66c3efc133982fd76920c9605",
"type": "github"
},
"original": {
"owner": "aylur",
"ref": "v1",
"repo": "ags",
"type": "github"
}
@ -53,6 +71,28 @@
"type": "github"
}
},
"astal": {
"inputs": {
"nixpkgs": [
"ags",
"ags",
"nixpkgs"
]
},
"locked": {
"lastModified": 1731952585,
"narHash": "sha256-Sh1E7sJd8JJM3PCU1ZOei/QWz97OLCENIi2rTRoaniw=",
"owner": "aylur",
"repo": "astal",
"rev": "664c7a4ddfcf48c6e8accd3c33bb94424b0e8609",
"type": "github"
},
"original": {
"owner": "aylur",
"repo": "astal",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -211,7 +251,7 @@
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_3",
"pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_2",
"systems": "systems",
"xdph": "xdph"
},
"locked": {
@ -376,15 +416,15 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
"owner": "NixOS",
"lastModified": 1732014248,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github"
},
"original": {
"owner": "NixOS",
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@ -537,21 +577,6 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"worktimer": {
"inputs": {
"flake-parts": "flake-parts_2",

View File

@ -20,7 +20,7 @@
inputs.hyprland.follows = "hyprland";
};
nur.url = "github:nix-community/NUR";
ags.url = "github:aylur/ags/v1";
ags.url = "./home/ags";
fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git";
worktimer = {
type = "git";

View File

@ -1,22 +0,0 @@
{ inputs, config, pkgs, ... }:
{
imports = [ inputs.ags.homeManagerModules.default ];
home.packages = [
pkgs.adw-gtk3
pkgs.papirus-icon-theme
];
programs.ags = {
enable = true;
configDir = ./files;
extraPackages = with pkgs; [
gtksourceview
webkitgtk
accountsservice
];
};
# home.file."${config.xdg.configHome}/ags" = {
# source = config.lib.file.mkOutOfStoreSymlink ./files;
# recursive = true;
# };
}

View File

@ -217,11 +217,7 @@ function Workspaces() : JSX.Element {
{bind(hyprland, "workspaces").as((wss) =>
wss
.sort((a, b) => a.id - b.id)
.filter(
(ws) =>
ws.get_monitor().get_id() ===
hyprland.get_focused_monitor().get_id(),
)
.filter(ws => ws && ws.get_monitor().get_id() === hyprland.get_focused_monitor().get_id())
.map((ws) => (
<button
className={bind(hyprland, "focusedWorkspace").as((fw) =>

View File

@ -10,6 +10,7 @@
};
outputs = {
self,
nixpkgs,
ags,
}: let

View File

@ -103,7 +103,7 @@ in {
"$altMod" = pkgs.lib.mkDefault "ALT_L";
exec-once = [
"hyprpaper"
"ags"
"${inputs.ags.packages.${pkgs.system}.default}/bin/ags-bar"
"${wl-paste} --type text --watch cliphist store"
"${wl-paste} --type image --watch cliphist store"
"${pkgs.mate.mate-polkit}/bin/polkit-mate"

View File

@ -34,7 +34,8 @@
lua-language-server
rust-analyzer
gopls
deno
# deno
typescript-language-server
jdt-language-server
emmet-ls
ruff

View File

@ -169,7 +169,7 @@ return {
capabilities = capabilities
}
require('lspconfig').denols.setup {
require('lspconfig').ts_ls.setup {
capabilities = capabilities
}

View File

@ -3,7 +3,6 @@
imports = [
(import ./common.nix { inherit inputs config pkgs; })
(import ../hyprland { inherit inputs pkgs; })
(import ../ags { inherit inputs config pkgs; })
../rofi
../alacritty
../kitty

View File

@ -7,6 +7,7 @@ in {
(import ../Common/desktop.nix { inherit inputs pkgs config; })
(import ../Common/nfs.nix { inherit pkgs serverIP; })
(import ../Common/zfs.nix {inherit inputs pkgs config; })
(import ../Common/android.nix {inherit inputs pkgs config; })
];
hardware.graphics.extraPackages = [