From e7275b4c37e99e215f55398860cc7be0c2c99758 Mon Sep 17 00:00:00 2001 From: zastian-dev Date: Wed, 10 Dec 2025 16:37:00 +0000 Subject: [PATCH] reee --- configuration.nix | 282 +++++++++++++++++++++++---------------- flake.lock | 308 ++++++++++++++++++++++--------------------- system/nixOSPkgs.nix | 3 +- system/services.nix | 2 +- 4 files changed, 332 insertions(+), 263 deletions(-) diff --git a/configuration.nix b/configuration.nix index 26aa49b..fa5e5ca 100755 --- a/configuration.nix +++ b/configuration.nix @@ -21,18 +21,13 @@ let useHypr = window_manager == "hyprland" || wmAll; in { - ############################################################################## - # Imports - ############################################################################## imports = [ ./hardware-configuration.nix ./system/hardware.nix ./system/boot.nix ./system/network.nix ./system/inputMethods.nix - ./system/services.nix ./system/fonts.nix - ./system/nixOSPkgs.nix inputs.home-manager.nixosModules.home-manager #inputs.niri.nixosModules.niri ]; @@ -49,110 +44,10 @@ in auto-optimise-store = true; }; - ############################################################################## - # Desktop / WM - ############################################################################## - programs.river-classic.enable = useRiver; - - qt = { - enable = true; - # style = "gtk2"; - platformTheme = "qt5ct"; - }; - - xdg.menus.enable = true; - - # Work around Dolphin menu oddities: force Plasma menu definition - environment.etc."/xdg/menus/applications.menu".text = - builtins.readFile "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu"; - - # Niri (via overlay) - #nixpkgs.overlays = [ inputs.niri.overlays.niri ]; - #programs.niri = { - # enable = useNiri; - # package = pkgs.niri-stable; # Only needed if not provided by the overlay - #}; - - # Hyprland - programs.hyprland = { - enable = useHypr; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; - }; - - # X11 base (kept enabled for keymap + DM if needed) - services.xserver = { - enable = true; - xkb = { - layout = "ie"; - variant = ""; - }; - - # displayManager.lightdm = { - # enable = true; - # greeters.gtk = { - # enable = true; - # theme.package = pkgs.amarena-theme; - # theme.name = "amarena"; - # cursorTheme.package = oreo.override { colors = [ "oreo_spark_pink_cursors" ]; }; - # cursorTheme.name = "oreo_spark_pink_cursors"; - # extraConfig = "background=${./assets/Wallpapers/138.png}"; - # }; - # }; - }; - - # greetd + tuigreet - services.greetd = { - enable = true; - restart = true; - useTextGreeter = true; - settings.default_session = { - command = "${lib.getExe pkgs.tuigreet} --window-padding 1 --time --time-format '%R - %F' --remember --remember-session --asterisks"; - user = "greeter"; - }; - }; - - ############################################################################## - # Security / PolicyKit / PAM - ############################################################################## - security = { - rtkit.enable = true; - polkit.enable = true; - pam.services = { - swaylock = { }; - greetd.enableGnomeKeyring = true; - greetd.kwallet.enable = true; - }; - }; - - ############################################################################## - # Environment - ############################################################################## - environment = { - sessionVariables = { - ZDOTDIR = "$HOME/.config/zsh"; - }; - pathsToLink = [ "/share/zsh" ]; - variables = { - # VAAPI and VDPAU config for accelerated video. - # See https://wiki.archlinux.org/index.php/Hardware_video_acceleration - VDPAU_DRIVER = "radeonsi"; - LIBVA_DRIVER_NAME = "radeonsi"; - # AMD_VULKAN_ICD = "RADV"; - # VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; - # XDG_CURRENT_DESKTOP = "hyprland"; - # QT_QPA_PLATFORMTHEME = "qt6ct"; - }; - - systemPackages = with pkgs; [ - vim - wget - neovim - ]; - }; - ############################################################################## # Users ############################################################################## + programs.zsh.enable = true; users = { users.mrfluffy = { isNormalUser = true; @@ -191,7 +86,16 @@ in "work" ]; }; - + # greetd + tuigreet + services.greetd = { + enable = true; + restart = true; + useTextGreeter = true; + settings.default_session = { + command = "${lib.getExe pkgs.tuigreet} --window-padding 1 --time --time-format '%R - %F' --remember --remember-session --asterisks"; + user = "greeter"; + }; + }; ############################################################################## # Home-Manager ############################################################################## @@ -204,14 +108,29 @@ in }; ############################################################################## - # Virtualisation + # Environment ############################################################################## - virtualisation = { - docker = { - enable = true; - storageDriver = lib.mkIf (systemName == "pc") "btrfs"; + environment = { + sessionVariables = { + ZDOTDIR = "$HOME/.config/zsh"; }; - libvirtd.enable = true; + pathsToLink = [ "/share/zsh" ]; + variables = { + # VAAPI and VDPAU config for accelerated video. + # See https://wiki.archlinux.org/index.php/Hardware_video_acceleration + VDPAU_DRIVER = "radeonsi"; + LIBVA_DRIVER_NAME = "radeonsi"; + # AMD_VULKAN_ICD = "RADV"; + # VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/radeon_icd.x86_64.json"; + # XDG_CURRENT_DESKTOP = "hyprland"; + # QT_QPA_PLATFORMTHEME = "qt6ct"; + }; + + systemPackages = with pkgs; [ + vim + wget + neovim + ]; }; ############################################################################## @@ -226,4 +145,141 @@ in # State version ############################################################################## system.stateVersion = "24.11"; # Did you read the comment? + + specialisation = { + steam = { + configuration = { + environment = { + systemPackages = with pkgs; [ + mangohud + gamemode + ]; + variables = { + LIBSEAT_BACKEND = "logind"; + }; + + }; + services.ananicy = { + enable = true; + package = pkgs.ananicy-cpp; + rulesProvider = pkgs.ananicy-cpp; + extraRules = [ + { + "name" = "gamescope"; + "nice" = -20; + } + ]; + }; + + programs = { + gamescope = { + enable = true; + capSysNice = false; + }; + + steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + extraCompatPackages = with pkgs; [ + gamescope + mangohud + gamemode + ]; + gamescopeSession.enable = true; + }; + }; + }; + }; + + main-system = { + configuration = { + ############################################################################## + # Imports + ############################################################################## + imports = [ + ./system/services.nix + + ./system/nixOSPkgs.nix + #inputs.niri.nixosModules.niri + ]; + + ############################################################################## + # Desktop / WM + ############################################################################## + programs.river-classic.enable = useRiver; + + qt = { + enable = true; + # style = "gtk2"; + platformTheme = "qt5ct"; + }; + + xdg.menus.enable = true; + + # Work around Dolphin menu oddities: force Plasma menu definition + environment.etc."/xdg/menus/applications.menu".text = + builtins.readFile "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu"; + + # Niri (via overlay) + #nixpkgs.overlays = [ inputs.niri.overlays.niri ]; + #programs.niri = { + # enable = useNiri; + # package = pkgs.niri-stable; # Only needed if not provided by the overlay + #}; + + # Hyprland + programs.hyprland = { + enable = useHypr; + package = inputs.hyprland.packages.${pkgs.system}.hyprland; + }; + + # X11 base (kept enabled for keymap + DM if needed) + services.xserver = { + enable = true; + xkb = { + layout = "ie"; + variant = ""; + }; + + # displayManager.lightdm = { + # enable = true; + # greeters.gtk = { + # enable = true; + # theme.package = pkgs.amarena-theme; + # theme.name = "amarena"; + # cursorTheme.package = oreo.override { colors = [ "oreo_spark_pink_cursors" ]; }; + # cursorTheme.name = "oreo_spark_pink_cursors"; + # extraConfig = "background=${./assets/Wallpapers/138.png}"; + # }; + # }; + }; + + ############################################################################## + # Security / PolicyKit / PAM + ############################################################################## + security = { + rtkit.enable = true; + polkit.enable = true; + pam.services = { + swaylock = { }; + greetd.enableGnomeKeyring = true; + greetd.kwallet.enable = true; + }; + }; + + ############################################################################## + # Virtualisation + ############################################################################## + virtualisation = { + docker = { + enable = true; + storageDriver = lib.mkIf (systemName == "pc") "btrfs"; + }; + libvirtd.enable = true; + }; + + }; + }; + }; } diff --git a/flake.lock b/flake.lock index 4684e22..88699b0 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1762356719, - "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", + "lastModified": 1764714051, + "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", + "rev": "a43bedcceced5c21ad36578ed823e6099af78214", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -157,11 +157,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1762651107, - "narHash": "sha256-V++8JREoP1TC6ROYByMAKx/cSyxza0tp1tUNOpq5Z4k=", + "lastModified": 1765071049, + "narHash": "sha256-HIJtxkYaGxUFZ03wOzF4pWhKWAvFuYBN9jAdhCzZvnI=", "owner": "caelestia-dots", "repo": "shell", - "rev": "c0ea060ffecd3f38233652556d3085d094082400", + "rev": "982d64d5e5b9295d12dec37d45442ed6a05fe284", "type": "github" }, "original": { @@ -181,11 +181,11 @@ ] }, "locked": { - "lastModified": 1762480719, - "narHash": "sha256-TjTMNmndJJIxP/N6owC/CoAPiRuM99fNaQbZqHDtwLw=", + "lastModified": 1764813773, + "narHash": "sha256-vpgjBAER+aoMjq6z9xuv/jvniXkRRgP/xfZMP2LbNlk=", "owner": "caelestia-dots", "repo": "cli", - "rev": "9323fbf1b497204e17dff103cf412daf04a5c723", + "rev": "1eead8615108e1977ac09ed428e1329adbb80f00", "type": "github" }, "original": { @@ -200,11 +200,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1762999229, - "narHash": "sha256-WrSudNT2O8Vw5/JAD2zgV+3aYERWaweJe6GDWCu3Wpk=", + "lastModified": 1765332282, + "narHash": "sha256-4VQn4aZ7eziRCVNVIYveglrMh6IAyCNOl+4IyhCgX3k=", "owner": "caelestia-dots", "repo": "cli", - "rev": "f9acac8fb2f6faaa5065b2d6cc30043a4f4bef0f", + "rev": "b1e4e92e98645a1908d7d0a8581e59b2cd1e52df", "type": "github" }, "original": { @@ -225,11 +225,11 @@ "quickshell": "quickshell_2" }, "locked": { - "lastModified": 1762651107, - "narHash": "sha256-V++8JREoP1TC6ROYByMAKx/cSyxza0tp1tUNOpq5Z4k=", + "lastModified": 1765071049, + "narHash": "sha256-HIJtxkYaGxUFZ03wOzF4pWhKWAvFuYBN9jAdhCzZvnI=", "owner": "caelestia-dots", "repo": "shell", - "rev": "c0ea060ffecd3f38233652556d3085d094082400", + "rev": "982d64d5e5b9295d12dec37d45442ed6a05fe284", "type": "github" }, "original": { @@ -241,11 +241,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -257,11 +257,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -325,11 +325,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -338,24 +338,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -397,18 +379,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "host": "gitlab.gnome.org", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", - "type": "github" + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", - "ref": "48.2", + "ref": "gnome-49", "repo": "gnome-shell", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -418,11 +402,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1765337252, + "narHash": "sha256-HuWQp8fM25fyWflbuunQkQI62Hg0ecJxWD52FAgmxqY=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "13cc1efd78b943b98c08d74c9060a5b59bf86921", "type": "github" }, "original": { @@ -476,11 +460,11 @@ ] }, "locked": { - "lastModified": 1762462052, - "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", + "lastModified": 1763733840, + "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", + "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", "type": "github" }, "original": { @@ -528,6 +512,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": [ "nixpkgs" ], @@ -536,11 +521,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1763071594, - "narHash": "sha256-s5FF0rQE6UIBAUfqk5ZqGedU3bhW0OvXfmz5lzJGurY=", + "lastModified": 1765319435, + "narHash": "sha256-9EU73XoTJNYiflVFDeplxE6BhAVg4TGPdiB4vbdJmXQ=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "43527d363472b52f17dd9f9f4f87ec25cbf8a399", + "rev": "f58c80fd3942034d58934ec4e4d93bfcfa3c786e", "type": "github" }, "original": { @@ -582,11 +567,11 @@ ] }, "locked": { - "lastModified": 1762755186, - "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=", + "lastModified": 1764812575, + "narHash": "sha256-1bK1yGgaR82vajUrt6z+BSljQvFn91D74WJ/vJsydtE=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3", + "rev": "fd321368a40c782cfa299991e5584ca338e36ebe", "type": "github" }, "original": { @@ -603,11 +588,11 @@ "nix-filter": "nix-filter" }, "locked": { - "lastModified": 1762785235, - "narHash": "sha256-r6eGySIoynCkJN8HqAl9urO7wd4ffGbYM4Kagkg+NPU=", + "lastModified": 1764873455, + "narHash": "sha256-ehm3Y0xCUkJnbDwM0wwu9DBj7f3lLTwFW9GBxH93w2s=", "owner": "Duckonaut", "repo": "split-monitor-workspaces", - "rev": "6e6fda5031a185af64724ecf738c53ff96ee7876", + "rev": "34d1ce459b4f13e77d8f2a0851475497abee2c98", "type": "github" }, "original": { @@ -633,11 +618,11 @@ ] }, "locked": { - "lastModified": 1762989208, - "narHash": "sha256-NBTbKW0MVIMFCjAqeoJWkg5iUucAZ9jS4Lbyax6rIBE=", + "lastModified": 1765207366, + "narHash": "sha256-s0jO2kEj5cLLTgTblKnAKjqt3MjYFnmyrQT3SxiUugM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "befb2670803cf7c1b9f0323449c8d9ccdaa485e2", + "rev": "e058ea23b80775cf20c675d064678416df2d9d04", "type": "github" }, "original": { @@ -687,11 +672,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -769,18 +754,18 @@ "hyprtoolkit": "hyprtoolkit_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "hyprwire": "hyprwire", + "hyprwire": "hyprwire_2", "nixpkgs": [ "nixpkgs" ], "systems": "systems_2" }, "locked": { - "lastModified": 1762862980, - "narHash": "sha256-+5gH6kSAPyvQ0lvYLlwDsfRuC0eMzeru2DUJwOd4zmQ=", + "lastModified": 1765324959, + "narHash": "sha256-Odz0We13yF+cHNeymyy1Xx+1fVg6f/oi8BWQZ+Qwyl4=", "owner": "hyprwm", "repo": "hyprlauncher", - "rev": "d06c961fef2752ce95617a4230a0b5bcdc540528", + "rev": "e380fdc517aacdf93a60a8ac648e88eda5e499cd", "type": "github" }, "original": { @@ -828,11 +813,11 @@ ] }, "locked": { - "lastModified": 1762463729, - "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", "type": "github" }, "original": { @@ -895,11 +880,11 @@ ] }, "locked": { - "lastModified": 1762387740, - "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", + "lastModified": 1764962281, + "narHash": "sha256-rGbEMhTTyTzw4iyz45lch5kXseqnqcEpmrHdy+zHsfo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", + "rev": "fe686486ac867a1a24f99c753bb40ffed338e4b0", "type": "github" }, "original": { @@ -945,11 +930,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -984,6 +969,35 @@ } }, "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1764872015, + "narHash": "sha256-INI9AVrQG5nJZFvGPSiUZ9FEUZJLfGdsqjF1QSak7Gc=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "7997451dcaab7b9d9d442f18985d514ec5891608", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, + "hyprwire_2": { "inputs": { "hyprutils": [ "hyprlauncher", @@ -1021,11 +1035,11 @@ ] }, "locked": { - "lastModified": 1762007860, - "narHash": "sha256-wDaM4D0Fqt0nCoFbZsi3mtAkIzzsbGdmuj+356KHEvU=", + "lastModified": 1764061716, + "narHash": "sha256-xKnIoMPv2kIsWhjRhJayqMWU2xkjeq2pyPmR1dLFPHs=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "2c770275b2fb78c813a52a4d52ba2d27789d8ec3", + "rev": "9bc9c1ab671eb1b610f549e15bc0b750ab987409", "type": "github" }, "original": { @@ -1076,11 +1090,11 @@ ] }, "locked": { - "lastModified": 1761451000, - "narHash": "sha256-qBJL6xEIjqYq9zOcG2vf2nPTeVBppNJzvO0LuQWMwMo=", + "lastModified": 1762660502, + "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ed6b293161b378a7368cda38659eb8d3d9a0dac4", + "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", "type": "github" }, "original": { @@ -1096,11 +1110,11 @@ ] }, "locked": { - "lastModified": 1762660502, - "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=", + "lastModified": 1765267181, + "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee", + "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f", "type": "github" }, "original": { @@ -1118,11 +1132,11 @@ ] }, "locked": { - "lastModified": 1763083547, - "narHash": "sha256-Gdk7+CBp/kefPCPIwrt6PHD3Vd9hhe58DVcew803x9o=", + "lastModified": 1765354228, + "narHash": "sha256-T0AjQ6GsUISIk2wTWl1DO2MGub2KiGaiivegmFQ4C8Q=", "owner": "kaylorben", "repo": "nixcord", - "rev": "db15ef80264e0c9f60aea019b657e3f9523445bd", + "rev": "38760fd1451b7a25cd151839b173c3996918f375", "type": "github" }, "original": { @@ -1133,11 +1147,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -1179,11 +1193,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762844143, - "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -1195,11 +1209,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -1211,11 +1225,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1758690382, - "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e643668fd71b949c53f8626614b21ff71a07379d", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -1253,11 +1267,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -1276,11 +1290,11 @@ ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -1317,11 +1331,11 @@ ] }, "locked": { - "lastModified": 1761897390, - "narHash": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=", + "lastModified": 1764663772, + "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", "ref": "refs/heads/master", - "rev": "fc704e6b5d445899a1565955268c91942a4f263f", - "revCount": 700, + "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "revCount": 713, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -1339,11 +1353,11 @@ ] }, "locked": { - "lastModified": 1761897390, - "narHash": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=", + "lastModified": 1764663772, + "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", "ref": "refs/heads/master", - "rev": "fc704e6b5d445899a1565955268c91942a4f263f", - "revCount": 700, + "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "revCount": 713, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -1359,11 +1373,11 @@ ] }, "locked": { - "lastModified": 1763115162, - "narHash": "sha256-TgHTFlFI9tZ4kp4yy8fcfy98srgcob9gcOeuKjs1Mw4=", + "lastModified": 1764663772, + "narHash": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", "ref": "refs/heads/master", - "rev": "a00ff0394431d1fe3f33ae0934c981930e2a1efb", - "revCount": 701, + "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", + "revCount": 713, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -1412,11 +1426,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1762264356, - "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", + "lastModified": 1765047449, + "narHash": "sha256-VQcqjJ2g0kT9TW4ENwA2HBQJzfbCUd5s1Wm3K+R2QZY=", "owner": "nix-community", "repo": "stylix", - "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", + "rev": "bd00e01aab676aee88e6cc5c9238b4a5a7d6639a", "type": "github" }, "original": { @@ -1521,11 +1535,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -1537,11 +1551,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -1553,11 +1567,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -1568,15 +1582,15 @@ }, "vicinae": { "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_5", + "systems": "systems_4" }, "locked": { - "lastModified": 1763132441, - "narHash": "sha256-+YWj9WeFhd3mVTAZ5vV6JEAXNT0gXr1i49bmREI+kRU=", + "lastModified": 1765272078, + "narHash": "sha256-etv2HJA9OWvTkjnrjaNSqvebu9gWLIGPYb9PWr4qkfM=", "owner": "vicinaehq", "repo": "vicinae", - "rev": "f80b6e970146c369cd2fc7e5bf26f6af0e6d6c46", + "rev": "32cf6b1f82e007cddba9c9ae037eff670219cd55", "type": "github" }, "original": { @@ -1636,11 +1650,11 @@ ] }, "locked": { - "lastModified": 1763097615, - "narHash": "sha256-qxpsf2FVzXrN0WDWRgeBz7RJ5vjHNFDy8oLqbC6gU3Y=", + "lastModified": 1765344150, + "narHash": "sha256-RoGBKQglbF19aINeV8F7DHCXxF7FrMRLgL2yjl9vOiQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "479ca480bf531285e88006aa1c70fd3bb5529f3d", + "rev": "1adab25828578301037855c59849e9bbecf8948b", "type": "github" }, "original": { diff --git a/system/nixOSPkgs.nix b/system/nixOSPkgs.nix index 15e4f13..af1d50d 100755 --- a/system/nixOSPkgs.nix +++ b/system/nixOSPkgs.nix @@ -111,7 +111,6 @@ in }; virt-manager.enable = true; - zsh.enable = true; corectrl.enable = true; opengamepadui = { @@ -124,7 +123,7 @@ in remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; extraCompatPackages = with pkgs; [ gamescope mangohud gamemode ]; - gamescopeSession.enable = true; + gamescopeSession.enable = false; }; # Dynamic linker for foreign binaries diff --git a/system/services.nix b/system/services.nix index a429781..8336a31 100755 --- a/system/services.nix +++ b/system/services.nix @@ -145,9 +145,9 @@ # Ollama (only on PC) services.ollama = lib.mkIf (systemName == "pc") { enable = true; + package = pkgs.ollama-rocm; port = 11434; host = "0.0.0.0"; - acceleration = "rocm"; rocmOverrideGfx = "11.0.0"; environmentVariables = { OLLAMA_DEBUG = "1";