diff --git a/flake.lock b/flake.lock index d1fa17c..c1d4f98 100644 --- a/flake.lock +++ b/flake.lock @@ -205,16 +205,15 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749154018, - "narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", + "lastModified": 1747565775, + "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", + "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -227,31 +226,30 @@ ] }, "locked": { - "lastModified": 1747556831, - "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", + "lastModified": 1747279714, + "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", + "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1749195551, - "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", - "owner": "nixos", + "lastModified": 1747129300, + "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", + "rev": "e81fd167b33121269149c57806599045fd33eeed", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "master", "repo": "nixos-hardware", "type": "github" @@ -259,48 +257,48 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749024892, - "narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", + "lastModified": 1747327360, + "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", + "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1749086602, - "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", + "lastModified": 1747327360, + "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4792576cb003c994bd7cc1edada3129def20b27d", + "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1747610100, - "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", + "lastModified": 1747327360, + "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", + "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -361,16 +359,15 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749238594, - "narHash": "sha256-pM5Mw81XTgMcrzw+br2ES/THEN1jrznEtWZ+SqnQAEY=", + "lastModified": 1747578370, + "narHash": "sha256-7pk8quDMQcGIVmm7KXMQLI5CbfamwPv/vO20cTcT/wI=", "owner": "danth", "repo": "stylix", - "rev": "2759a42f9be7adf3ca09c7a6c3bf8b94d61fba84", + "rev": "2eaa338eb879b8432f7e252d6ab8725ada98f52d", "type": "github" }, "original": { "owner": "danth", - "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -410,16 +407,17 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1735730497, - "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 5a49f66..ac6cf74 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Nixos config flake"; inputs = { - stylix.url = "github:danth/stylix/release-25.05"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - home-manager.url = "github:nix-community/home-manager/release-25.05"; - nixos-hardware.url = "github:nixos/nixos-hardware/master"; + stylix.url = "github:danth/stylix"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + home-manager.url = "github:nix-community/home-manager"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; }; outputs = { diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 89fa47c..c72fd29 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -27,8 +27,8 @@ gc.automatic = false; settings = { experimental-features = ["nix-command" "flakes"]; - #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; - #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; + substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; + trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; }; }; @@ -96,24 +96,6 @@ thermald.enable = true; }; - virtualisation.libvirtd = { - enable = true; - qemu = { - package = pkgs.qemu_kvm; - runAsRoot = true; - swtpm.enable = true; - ovmf = { - enable = true; - packages = [ - (pkgs.OVMF.override { - secureBoot = true; - tpmSupport = true; - }).fd - ]; - }; - }; - }; - stylix = { enable = true; autoEnable = true; @@ -176,7 +158,7 @@ users.users.k = { isNormalUser = true; description = "k"; - extraGroups = ["networkmanager" "wheel" "cdrom" "libvirtd"]; + extraGroups = ["networkmanager" "wheel"]; packages = with pkgs; [nushell]; shell = pkgs.nushell; }; diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 2c946f3..d6d28f9 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -24,10 +24,6 @@ zip emacs-gtk - prismlauncher - steam - gamescope - direnv texliveFull ispell @@ -49,11 +45,10 @@ enable = true; musicDirectory = "/home/k/Music"; }; - emacs = { enable = true; defaultEditor = true; - package = pkgs.emacs-pgtk; + package = pkgs.emacs-gtk; }; }; stylix = {