diff --git a/config/desktop.nix b/config/desktop.nix index 91bb13c..279bf2b 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -12,9 +12,10 @@ services.xserver.enable = true; # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; services.gnome.gnome-keyring.enable = true; + security.pam.services.gdm.enableGnomeKeyring = true; #unlock PAM # Configure keymap in X11 services.xserver.xkb = { @@ -66,6 +67,10 @@ systemd.services."getty@tty1".enable = false; systemd.services."autovt@tty1".enable = false; + services.xserver.desktopManager.retroarch.extraArgs = [ + "--config=/mnt/services/emulators/retroarch/retroarch.cfg" + ]; + services.ollama = { enable = true; acceleration = "cuda"; @@ -103,6 +108,7 @@ audacity blender cura-appimage + firefox gimp gnomeExtensions.appindicator gnomeExtensions.blur-my-shell @@ -112,6 +118,7 @@ kiwix libreoffice obs-studio + proton-authenticator protonmail-desktop prismlauncher signal-desktop @@ -140,6 +147,7 @@ openrct2 openttd xonotic + osu-lazer-bin # game utils mangohud @@ -171,8 +179,7 @@ fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji - noto-fonts-extra + noto-fonts-color-emoji corefonts fira-mono ]; @@ -200,7 +207,6 @@ coolercontrol = { enable = true; - nvidiaSupport = true; }; gamescope = { @@ -230,10 +236,10 @@ "proton-mail.desktop" "joplin.desktop" "signal.desktop" + "element-desktop.desktop" "steam.desktop" "org.gnome.Settings.desktop" "org.gnome.Console.desktop" - "'ca.desrt.dconf-editor.desktop" ]; enabled-extensions = [ pkgs.gnomeExtensions.appindicator.extensionUuid diff --git a/flake.lock b/flake.lock index 0bed782..ea8a870 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761656077, - "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -71,27 +71,27 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764536451, + "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1761827175, - "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -119,16 +119,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "lastModified": 1764494334, + "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "rev": "d542db745310b6929708d9abea513f3ff19b1341", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 68609c0..235e1c1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,9 @@ inputs = { agenix.url = "github:ryantm/agenix"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixos-hardware.url = "github:nixos/nixos-hardware/master"; - home-manager.url = "github:nix-community/home-manager/release-25.05"; + home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/common.nix b/home/common.nix index cc8cb36..b5e1d51 100644 --- a/home/common.nix +++ b/home/common.nix @@ -67,8 +67,8 @@ git = { enable = true; - userName = "Faris"; - userEmail = "faris@mektem.com"; + settings.user.Name = "Faris"; + settings.user.email = "faris@mektem.com"; }; }; diff --git a/hosts/desktop/settings.nix b/hosts/desktop/settings.nix index 24c2b86..eb6d2e7 100644 --- a/hosts/desktop/settings.nix +++ b/hosts/desktop/settings.nix @@ -3,8 +3,7 @@ { boot = { - initrd.luks.devices."luks-d6ea38c1-693a-4aa1-b844-24f005b321ab".device = - "/dev/disk/by-uuid/d6ea38c1-693a-4aa1-b844-24f005b321ab"; + initrd.luks.devices."luks-cbf20b12-90f7-4fbb-95d3-1320eece4d89".device = "/dev/disk/by-uuid/cbf20b12-90f7-4fbb-95d3-1320eece4d89"; kernelParams = [ "nvidia_drm.modeset=1" "nvidia_drm.fbdev=1" @@ -13,6 +12,12 @@ ]; }; + #fileSystems."/run/media/admin/08cabc7a-9a6e-4c21-8a07-6663af77b705" = { + # device = "/dev/08cabc7a-9a6e-4c21-8a07-6663af77b705"; + # fsType = "ext4"; + # options = ["rw,nosuid,nodev,relatime,errors=remount-ro"]; + # }; + networking = { hostName = "nixos-desktop"; interfaces.enp42s0 = { @@ -29,7 +34,6 @@ }; services = { - ollama.loadModels = [ "deepseek-r1:14b" ]; xserver.videoDrivers = [ "nvidia" ]; }; diff --git a/update-desktop.sh b/update-desktop.sh new file mode 100755 index 0000000..a4a2a1a --- /dev/null +++ b/update-desktop.sh @@ -0,0 +1,2 @@ +nix flake update +sudo nixos-rebuild switch --flake .#desktop