From 67c4afbd129adce05e4ccd093858feb10bf215c7 Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Mon, 18 Mar 2024 16:30:09 +0100 Subject: [PATCH 1/4] Desktop updates --- modules/home/desktop/hyprland/default.nix | 1 + modules/system/desktop/amd.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix index b5d3985..e51f9f2 100644 --- a/modules/home/desktop/hyprland/default.nix +++ b/modules/home/desktop/hyprland/default.nix @@ -96,6 +96,7 @@ "$mod,ESCAPE, exec, nwg-bar" "$mod, C, killactive" + "$mod SHIFT, C, exec, hyprctl kill" "$mod, V, togglefloating" "$mod, F, fullscreen, 0" "$mod, M, fullscreen, 1" diff --git a/modules/system/desktop/amd.nix b/modules/system/desktop/amd.nix index 412fb71..a202f36 100644 --- a/modules/system/desktop/amd.nix +++ b/modules/system/desktop/amd.nix @@ -12,4 +12,6 @@ hardware.opengl.extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; + + programs.gamemode.enable = true; } From 50d94f32f0076cfb803c7d269b9c1be501c43791 Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Mon, 18 Mar 2024 16:31:49 +0100 Subject: [PATCH 2/4] Added gamemode --- modules/system/desktop/nvidia.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/system/desktop/nvidia.nix b/modules/system/desktop/nvidia.nix index 936c870..5c5189e 100644 --- a/modules/system/desktop/nvidia.nix +++ b/modules/system/desktop/nvidia.nix @@ -36,4 +36,6 @@ package = config.boot.kernelPackages.nvidiaPackages.stable; }; + + programs.gamemode.enable = true; } From bfd4bae4fbe0a2d41ac1a3005569b365616da3be Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Wed, 20 Mar 2024 07:44:38 +0100 Subject: [PATCH 3/4] Updated configurations --- hosts/desktop/default.nix | 1 + hosts/desktop/home.nix | 2 +- hosts/laptop/home.nix | 2 +- modules/home/programs/common.nix | 3 +++ modules/system/utils/docker.nix | 7 +++++++ 5 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 modules/system/utils/docker.nix diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index f6ee956..a26aef1 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -11,6 +11,7 @@ ../../modules/system/programs/thunar.nix ../../modules/system/programs/steam.nix ../../modules/system/utils/common.nix + ../../modules/system/utils/docker.nix ../../modules/system/utils/firewall.nix #../../modules/system/utils/fprint.nix ../../modules/system/utils/garbage-collection.nix diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 91d05a2..909ce26 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -25,7 +25,7 @@ kdenlive gthumb unstable.arduino-ide - prismlauncher + unstable.prismlauncher ]; home.sessionVariables = { diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index b05135e..9b8aaf1 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -26,7 +26,7 @@ gthumb unstable.arduino-ide moonlight-qt - prismlauncher + unstable.prismlauncher ]; home.stateVersion = "23.11"; diff --git a/modules/home/programs/common.nix b/modules/home/programs/common.nix index 8235d00..f69871f 100644 --- a/modules/home/programs/common.nix +++ b/modules/home/programs/common.nix @@ -12,5 +12,8 @@ bitwarden pavucontrol unstable.youtube-music + + # CLI tools + cloc ]; } diff --git a/modules/system/utils/docker.nix b/modules/system/utils/docker.nix new file mode 100644 index 0000000..b3f01b0 --- /dev/null +++ b/modules/system/utils/docker.nix @@ -0,0 +1,7 @@ +{ ... }: + +{ + virtualisation.docker.enable = true; + + users.users.xeovalyte.extraGroups = [ "docker" ]; +} From be2e75511d298af58e03991c951f0d5af1209f3e Mon Sep 17 00:00:00 2001 From: xeovalyte Date: Sat, 23 Mar 2024 09:30:13 +0100 Subject: [PATCH 4/4] Edited desktop configuration --- flake.lock | 36 +++++++++++++++--------------- hosts/desktop/home.nix | 2 +- hosts/laptop/home.nix | 2 +- modules/home/programs/modrinth.nix | 2 +- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index df026a4..c4f0a85 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1710404542, - "narHash": "sha256-eHtM7/2AVx0Ggc/kDjPP3UKVh93WGeE8rxEffr1mn1A=", + "lastModified": 1711124527, + "narHash": "sha256-nCTtAShwdthp+scvmLevc06gtY9gglXq2vCdsszTqIA=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4c5fb09b2f070beefb5cf2d6133cd0acf316bf45", + "rev": "d1f6bbea177a3542d9ad3ecead77089b65e09963", "type": "gitlab" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1710124615, - "narHash": "sha256-VFF4l95pXSzkz/U5WxORWhWvK4f+x8PY9VQRgEn9qb0=", + "lastModified": 1711056091, + "narHash": "sha256-tOerD2Fk8ZZQloceDh9vx9zptmoACmS2K9yvtnMerXs=", "owner": "getchoo", "repo": "nix-exprs", - "rev": "ca5b1d79dafeef4258dc4cec4d4c04281d27e0d1", + "rev": "6493e74983d5549bcc97cb669bf3790b1f4ef284", "type": "github" }, "original": { @@ -81,11 +81,11 @@ ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1710888565, + "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", "type": "github" }, "original": { @@ -168,11 +168,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710365106, - "narHash": "sha256-BAt07JNgMEXDuzR3pHX+ROBY63SaMe/6yxI7Z6OFxqg=", + "lastModified": 1711101603, + "narHash": "sha256-5/uA1LoIQ6BhvABbTy46w97vO+q5jcngZ4BOsJtKiXs=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "988d5b3957fceb23e59716eebaf5f6bd16d566f0", + "rev": "0db5afb9d618571048bc30958e10b1990130bbb4", "type": "github" }, "original": { @@ -202,11 +202,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710283656, - "narHash": "sha256-nI+AOy4uK6jLGBi9nsbHjL1EdSIzoo8oa+9oeVhbyFc=", + "lastModified": 1711124224, + "narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51063ed4f2343a59fdeebb279bb81d87d453942b", + "rev": "56528ee42526794d413d6f244648aaee4a7b56c0", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1711001935, + "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "20f77aa09916374aa3141cbc605c955626762c9a", "type": "github" }, "original": { diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 909ce26..5e976ba 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -25,7 +25,7 @@ kdenlive gthumb unstable.arduino-ide - unstable.prismlauncher + unstable.prismlauncher-qt5 ]; home.sessionVariables = { diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 9b8aaf1..d06890b 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -26,7 +26,7 @@ gthumb unstable.arduino-ide moonlight-qt - unstable.prismlauncher + unstable.prismlauncher-qt5 ]; home.stateVersion = "23.11"; diff --git a/modules/home/programs/modrinth.nix b/modules/home/programs/modrinth.nix index 1990fe1..37ac051 100644 --- a/modules/home/programs/modrinth.nix +++ b/modules/home/programs/modrinth.nix @@ -2,7 +2,7 @@ { nix.settings = { - substituters = ["https://getchoo.cachix.org"]; + trusted-substituters = ["https://getchoo.cachix.org"]; trusted-public-keys = ["getchoo.cachix.org-1:ftdbAUJVNaFonM0obRGgR5+nUmdLMM+AOvDOSx0z5tE="]; };