diff --git a/flake.lock b/flake.lock index ffddf05..05dd47c 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716987116, - "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", + "lastModified": 1717248095, + "narHash": "sha256-e8X2eWjAHJQT82AAN+mCI0B68cIDBJpqJ156+VRrFO0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", + "rev": "7b49d3967613d9aacac5b340ef158d493906ba79", "type": "github" }, "original": { @@ -298,11 +298,11 @@ ] }, "locked": { - "lastModified": 1715940852, - "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=", + "lastModified": 1717182148, + "narHash": "sha256-Hi09/RoizxubRf3PHToT2Nm7TL8B/abSVa6q82uEgNI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b", + "rev": "03b982b77df58d5974c61c6022085bafe780c1cf", "type": "github" }, "original": { diff --git a/home/modules/xdg.nix b/home/modules/xdg.nix index e252d60..b093eca 100644 --- a/home/modules/xdg.nix +++ b/home/modules/xdg.nix @@ -35,12 +35,12 @@ in defaultApplications = apps; }; userDirs = { + desktop = "\$HOME/.desktop"; download = "\$HOME/tmp"; music = "\$HOME/lib/music"; videos = "\$HOME/lib/videos"; pictures = "\$HOME/lib/pictures"; documents = "\$HOME/lib"; - desktop = "$HOME/tmp"; }; }; home.packages = with pkgs; [ diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 0320d16..d0d67bf 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -197,6 +197,11 @@ in #}; services.gnome3.gnome-keyring.enable = lib.mkForce false; + programs.gnupg.agent.enable = true; + + services.xserver.enable = true; + services.xserver.desktopManager.gnome.enable = true; + services.xserver.displayManager.gdm.enable = true; hardware.opengl = { enable = true; diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 3684a98..56e17cd 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -47,5 +47,7 @@ in enable = mkDefault true; fallbackDns = [ "9.9.9.9#dns.quad9.net" "2620:fe::fe:11#dns11.quad9.net" ]; }; + + programs.zsh.enable = mkDefault true; } diff --git a/nixos/modules/profiles/laptop.nix b/nixos/modules/profiles/laptop.nix index 397c04a..cc36988 100644 --- a/nixos/modules/profiles/laptop.nix +++ b/nixos/modules/profiles/laptop.nix @@ -43,10 +43,6 @@ with lib; { networking.networkmanager.enable = mkDefault true; networking.firewall.enable = mkDefault true; - services.xserver.enable = mkDefault true; - services.xserver.displayManager.gdm.enable = mkDefault true; - services.xserver.desktopManager.gnome.enable = mkDefault true; - xdg.mime.enable = mkDefault true; security.rtkit.enable = true;