diff --git a/flake.lock b/flake.lock index f9422d3..915ffff 100644 --- a/flake.lock +++ b/flake.lock @@ -182,18 +182,34 @@ } }, "dzgui": { + "flake": false, + "locked": { + "lastModified": 1684281410, + "narHash": "sha256-mjkEouCBiAu4so1kolmHbZAyH63LSGlrv4JANcj8+Vc=", + "owner": "aclist", + "repo": "dztui", + "rev": "8f66d12131f639116436dc41adf45632ab4251b5", + "type": "github" + }, + "original": { + "owner": "aclist", + "repo": "dztui", + "type": "github" + } + }, + "dzgui-nix": { "inputs": { - "dzgui": "dzgui_2", + "dzgui": "dzgui", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1682130083, - "narHash": "sha256-uLCP1ZlyKGl6xe43c2ltgEYpuAJY7sx+ApBcy1jwd1E=", + "lastModified": 1684378042, + "narHash": "sha256-9l/j4B16a7y1s+eFf+As14e3M6V8zuyqj01EytUdt3A=", "owner": "lelgenio", "repo": "dzgui-nix", - "rev": "e18a4c048cd30188458a092d5eb27a0108a40cb2", + "rev": "9a67e3e0988e7a076e6a1033365be94cd0c3d8de", "type": "github" }, "original": { @@ -202,22 +218,6 @@ "type": "github" } }, - "dzgui_2": { - "flake": false, - "locked": { - "lastModified": 1677659849, - "narHash": "sha256-yTa/CN+GN/+UIp/2501iYRVoo4X6HcZdaS62gutBI4o=", - "owner": "aclist", - "repo": "dztui", - "rev": "c7c93558ae130e5281cebb3231f32377d37d21e2", - "type": "github" - }, - "original": { - "owner": "aclist", - "repo": "dztui", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": [ @@ -660,7 +660,7 @@ "alacritty-sixel": "alacritty-sixel", "demoji": "demoji", "dhist": "dhist", - "dzgui": "dzgui", + "dzgui-nix": "dzgui-nix", "home-manager": "home-manager_2", "hyprland": "hyprland", "lipsum": "lipsum", diff --git a/flake.nix b/flake.nix index 198e497..8d8381a 100644 --- a/flake.nix +++ b/flake.nix @@ -46,8 +46,8 @@ agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; - dzgui.url = "github:lelgenio/dzgui-nix"; - dzgui.inputs.nixpkgs.follows = "nixpkgs"; + dzgui-nix.url = "github:lelgenio/dzgui-nix"; + dzgui-nix.inputs.nixpkgs.follows = "nixpkgs"; # my stuff dhist.url = "github:lelgenio/dhist"; @@ -78,6 +78,7 @@ # nur.nixosModules.nur inputs.agenix.nixosModules.default inputs.hyprland.nixosModules.default + inputs.dzgui-nix.nixosModules.default { programs.hyprland.enable = (desktop == "hyprland"); } home-manager.nixosModules.home-manager { @@ -133,7 +134,7 @@ modules = [ ./user/home.nix ]; }; - packages.${system} = packages; + packages.${system} = pkgs // packages; formatter.${system} = pkgs.nixpkgs-fmt; }; diff --git a/overlays/default.nix b/overlays/default.nix index f69bbd2..35caadc 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -45,7 +45,6 @@ dhist = inputs.dhist.packages.${prev.system}.dhist; demoji = inputs.demoji.packages.${prev.system}.default; maildir-notify-daemon = inputs.maildir-notify-daemon.packages.${prev.system}.default; - dzgui = inputs.dzgui.packages.${prev.system}.dzgui; mpvpaper = inputs.wegank.packages.${prev.system}.mpvpaper; sea-orm-cli = inputs.sea-orm-cli.legacyPackages.${prev.system}.sea-orm-cli; diff --git a/system/configuration.nix b/system/configuration.nix index 1ea21c8..5d17c59 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -7,10 +7,6 @@ boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernel.sysctl = { - "vm.max_map_count" = 1048576; # Needed by DayZ - }; - zramSwap.enable = true; programs.adb.enable = true; @@ -104,6 +100,9 @@ # services.getty.autologinUser = "lelgenio"; programs.fish.enable = true; + + programs.dzgui.enable = true; + # TODO: enable thunar plugins # programs.thunar.enable = true; # programs.thunar.plugins = with pkgs.xfce; [ thunar-archive-plugin thunar-volman ]; diff --git a/user/home.nix b/user/home.nix index f22df53..9e2ea8f 100644 --- a/user/home.nix +++ b/user/home.nix @@ -81,7 +81,7 @@ # lutris-unwrapped # steam # It's enabled in the system config gamescope - dzgui + unstable.amdgpu_top ## chat thunderbird @@ -134,7 +134,7 @@ cargo-sweep cargo-checkmate cargo-audit - pkgs.unstable.rust-analyzer + rust-analyzer gcc rnix-lsp nixpkgs-fmt