diff --git a/flake.lock b/flake.lock index a56a447..337d9db 100644 --- a/flake.lock +++ b/flake.lock @@ -26,16 +26,15 @@ ] }, "locked": { - "lastModified": 1716729592, - "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", + "lastModified": 1716736760, + "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", + "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -57,6 +56,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1716633019, + "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1716655032, "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", @@ -72,7 +87,7 @@ "type": "github" } }, - "nixpkgs-unstable": { + "nixpkgs_2": { "locked": { "lastModified": 1716509168, "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", @@ -88,22 +103,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_3": { "locked": { "lastModified": 1713248628, @@ -160,7 +159,7 @@ "ghettoptt": "ghettoptt", "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-stable": "nixpkgs-stable", "notlistener": "notlistener", "sops-nix": "sops-nix" } @@ -168,7 +167,7 @@ "sops-nix": { "inputs": { "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1716692524, diff --git a/flake.nix b/flake.nix index 316c7fc..2b6381c 100644 --- a/flake.nix +++ b/flake.nix @@ -3,10 +3,10 @@ inputs = { # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-23.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager?ref=release-23.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix.url = "github:Mic92/sops-nix"; @@ -17,7 +17,7 @@ outputs = { self , nixpkgs - , nixpkgs-unstable + , nixpkgs-stable , sops-nix , notlistener , ghettoptt @@ -26,8 +26,8 @@ let system = "x86_64-linux"; user = "torjus"; - overlay-unstable = final: prev: { - unstable = import nixpkgs-unstable { + overlay-stable = final: prev: { + stable = import nixpkgs-stable { inherit system; config.allowUnfree = true; }; @@ -46,7 +46,7 @@ modules = [ ({ config, pkgs, ... }: { nixpkgs.overlays = [ - overlay-unstable + overlay-stable ghettoptt.overlays.default ]; }) @@ -60,7 +60,7 @@ modules = [ ({ config, pkgs, ... }: { nixpkgs.overlays = [ - overlay-unstable + overlay-stable notlistener.overlays.default ghettoptt.overlays.default ]; diff --git a/home/hyprland/hypridle.nix b/home/hyprland/hypridle.nix index 0998d69..8def097 100644 --- a/home/hyprland/hypridle.nix +++ b/home/hyprland/hypridle.nix @@ -1,7 +1,7 @@ { config, osConfig, pkgs, ... }: { home.packages = with pkgs; [ - unstable.hypridle + hypridle ]; xdg.configFile = { "hypr/hypridle.conf" = { diff --git a/home/hyprland/hyprland_gunter.nix b/home/hyprland/hyprland_gunter.nix index adb87fd..50ed671 100644 --- a/home/hyprland/hyprland_gunter.nix +++ b/home/hyprland/hyprland_gunter.nix @@ -24,7 +24,7 @@ wayland.windowManager.hyprland = { enable = true; - package = pkgs.unstable.hyprland; + package = pkgs.hyprland; settings = { "$mainMod" = "SUPER"; "$shiftMainMod" = "SUPER_SHIFT"; diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix index c4a7427..f9b52fc 100644 --- a/home/hyprland/hyprlock.nix +++ b/home/hyprland/hyprlock.nix @@ -1,7 +1,7 @@ { config, osConfig, pkgs, ... }: { home.packages = with pkgs; [ - unstable.hyprlock + hyprlock ]; xdg.configFile = { "hypr/hyprlock.conf" = { diff --git a/home/packages/default.nix b/home/packages/default.nix index 24403f2..adfa5a9 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -12,19 +12,19 @@ in age alacritty bat - unstable.btop + btop # (unstable.btop.override { # cudaSupport = true; # }) bzip2 croc - unstable.dust + dust easyeffects eza fd ffmpeg file - unstable.fzf + fzf go-task glib jq @@ -39,7 +39,7 @@ in pamixer pinentry pre-commit - (unstable.prismlauncher.override { + (prismlauncher.override { withWaylandGLFW = true; }) pulseaudio @@ -52,19 +52,19 @@ in spotify spicetify-cli sshfs - unstable.tldr - unstable.devenv - unstable.ventoy + tldr + devenv + ventoy discord zoxide # k8s tools - unstable.talosctl - unstable.k9s - unstable.cilium-cli - unstable.kubernetes-helm - unstable.cmctl - unstable.krew + talosctl + k9s + cilium-cli + kubernetes-helm + cmctl + krew # steam # steam-run @@ -73,8 +73,8 @@ in tokei unzip yt-dlp - unstable.zoom-us - unstable.vmware-horizon-client + zoom-us + vmware-horizon-client # Editors # vscode @@ -90,7 +90,7 @@ in typescript # Py stuff - (unstable.python312.withPackages (p: with p; [ + (python312.withPackages (p: with p; [ requests ipython ])) @@ -103,7 +103,7 @@ in rust-analyzer # blender - (unstable.blender.override { + (blender.override { cudaSupport = withCuda; }) diff --git a/home/zsh/default.nix b/home/zsh/default.nix index b183836..f48f46e 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -3,10 +3,10 @@ programs.direnv = { enable = true; enableZshIntegration = true; - package = pkgs.unstable.direnv; + package = pkgs.direnv; nix-direnv = { enable = true; - package = pkgs.unstable.nix-direnv; + package = pkgs.nix-direnv; }; }; programs.zsh = { diff --git a/hosts/gunter/configuration.nix b/hosts/gunter/configuration.nix index 3e686fc..285592d 100644 --- a/hosts/gunter/configuration.nix +++ b/hosts/gunter/configuration.nix @@ -15,7 +15,7 @@ # Bootloader stuff boot = { # Kernel stuff - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_xanmod_latest; kernelParams = [ "quiet" "splash" @@ -66,15 +66,15 @@ open = false; nvidiaSettings = true; - # package = config.boot.kernelPackages.nvidiaPackages.stable; - package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "555.42.02"; - sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk="; - sha256_aarch64 = lib.fakeSha256; - openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA="; - settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA="; - persistencedSha256 = lib.fakeSha256; - }; + package = config.boot.kernelPackages.nvidiaPackages.beta; + # package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + # version = "555.42.02"; + # sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk="; + # sha256_aarch64 = lib.fakeSha256; + # openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA="; + # settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA="; + # persistencedSha256 = lib.fakeSha256; + # }; }; # Setup hyprland @@ -94,7 +94,7 @@ programs.hyprland = { enable = true; xwayland.enable = true; - portalPackage = pkgs.unstable.xdg-desktop-portal-hyprland; + portalPackage = pkgs.xdg-desktop-portal-hyprland; }; # Setup common XDG env vars diff --git a/system/security.nix b/system/security.nix index f19b801..700fa27 100644 --- a/system/security.nix +++ b/system/security.nix @@ -5,6 +5,9 @@ wheelNeedsPassword = false; }; + # Enable polkit + security.polkit.enable = true; + # Enable rtkit security.rtkit.enable = true; }