diff --git a/flake.lock b/flake.lock index 418230e..2bfae9a 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "yafas": "yafas" }, "locked": { - "lastModified": 1719992991, - "narHash": "sha256-X1WYxzXRB/KbYLML90AtMTE0mpLHtAe6avSDBh203bs=", + "lastModified": 1720277930, + "narHash": "sha256-A1D2H6FQotrpbfq+ge1jpCScFiLYrwKCK8If2qsvmTM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "378c12fede02f2cbdb14508af603cbefa334bcac", + "rev": "d30a5f8d5414996f587679dc4fb4e29b4b02830b", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1720056646, - "narHash": "sha256-BymcV4HWtx2VFuabDCM4/nEJcfivCx0S02wUCz11mAY=", + "lastModified": 1720402389, + "narHash": "sha256-zJv6euDOrJWMHBhxfp/ay+Dvjwpe8YtMuEI5b09bxmo=", "owner": "nix-community", "repo": "disko", - "rev": "64679cd7f318c9b6595902b47d4585b1d51d5f9e", + "rev": "f1a00e7f55dc266ef286cc6fc8458fa2b5ca2414", "type": "github" }, "original": { @@ -63,7 +63,7 @@ "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs" ], "nixpkgs-stable": [ "nixpkgs" @@ -386,11 +386,11 @@ ] }, "locked": { - "lastModified": 1720045378, - "narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", + "lastModified": 1720327769, + "narHash": "sha256-kAsg3Lg4YKKpGw+f1W2s5hzjP8B0y/juowvjK8utIag=", "owner": "nix-community", "repo": "home-manager", - "rev": "0a30138c694ab3b048ac300794c2eb599dc40266", + "rev": "6b7ce96f34b324e4e104abc30d06955d216bac71", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1719832725, - "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=", + "lastModified": 1720334033, + "narHash": "sha256-X9pEvvHTVWJphhbUYqXvlLedOndNqGB7rvhSvL2CIgU=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "2917972ed34ce292309b3a4976286f8b5c08db27", + "rev": "685e40e1348007d2cf76747a201bab43d86b38cb", "type": "github" }, "original": { @@ -549,11 +549,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1719829515, - "narHash": "sha256-dBWcpHCVDi58lnVEPaYgRiQnlqcfbnTNGMLVOpDWq38=", + "lastModified": 1720354748, + "narHash": "sha256-QyuNREH5M0FZG0iVeOB3pUABIz9kqN+a1MYLzl3978Q=", "owner": "nix-community", "repo": "nix-ld-rs", - "rev": "594465d9e48c86038d4833125067cc7af143bd3a", + "rev": "45eec25fe63b5c421c9439a743a2416a6cdea00b", "type": "github" }, "original": { @@ -604,11 +604,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1719895800, - "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=", + "lastModified": 1720372297, + "narHash": "sha256-bwy1rPQSQSCj/TNf1yswHW88nBQYvJQkeScGvOA8pd4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6e253f12b1009053eff5344be5e835f604bb64cd", + "rev": "da0aa7b533d49e6319c603e07b46a5690082f65f", "type": "github" }, "original": { @@ -620,11 +620,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -680,22 +680,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1720058333, - "narHash": "sha256-gM2RCi5XkxmcsZ44pUkKIYBiBMfZ6u7MdcZcykmccrs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6842b061970bf96965d66fcc86a28e1f719aae95", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1716509168, @@ -762,11 +746,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720031269, + "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "type": "github" }, "original": { @@ -831,11 +815,11 @@ }, "nur": { "locked": { - "lastModified": 1720074587, - "narHash": "sha256-pjCjVfNmj38856QqK0PgBjqQvTps5JBX1vVB3rs8qBw=", + "lastModified": 1720422264, + "narHash": "sha256-oPd3E1XD2sjOsi32hTpklOZevwg2DjhYWYY14IbSC/s=", "owner": "nix-community", "repo": "NUR", - "rev": "dd332d4c8247a452e5112af85d183340bd88640a", + "rev": "db025ae0e02678497a77cff0a174062d913fbc39", "type": "github" }, "original": { @@ -870,11 +854,11 @@ ] }, "locked": { - "lastModified": 1719875930, - "narHash": "sha256-jQmdWLxRP6BzOxRF8hQEhDD7UKw7UrnYbmaAPOSaXWY=", + "lastModified": 1720369165, + "narHash": "sha256-MLRzgdEEmckPVwwllD8+4zkqnnxfMgFw5zk6O3JUiks=", "owner": "pjones", "repo": "plasma-manager", - "rev": "7e062fcd669e261fb06cf54fe0ef2e46c3db8e83", + "rev": "995d818078778b366e6302ea32d83c2ba586e015", "type": "github" }, "original": { @@ -926,7 +910,6 @@ "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", - "nixpkgs-unstable": "nixpkgs-unstable", "nixtheplanet": "nixtheplanet", "nur": "nur", "plasma-manager": "plasma-manager" diff --git a/flake.nix b/flake.nix index dd0be44..d9a5623 100644 --- a/flake.nix +++ b/flake.nix @@ -4,9 +4,6 @@ nixConfig = { }; inputs = { - nixpkgs-unstable = { - url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - }; nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; }; @@ -24,7 +21,7 @@ emacs-overlay = { url = "github:nix-community/emacs-overlay/66f48ac73046a9dab5f896f0bfa5c618b94417cb"; inputs.nixpkgs-stable.follows = "nixpkgs"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; }; disko = { url = "github:nix-community/disko"; @@ -62,7 +59,6 @@ outputs = { self , nixpkgs - , nixpkgs-unstable , nixos-hardware , nixtheplanet , nixinate @@ -79,10 +75,8 @@ } @ inputs: let system = "x86_64-linux"; - unstable-pkgs = import nixpkgs-unstable pkgs-args; my-overlay = final: prev: { my = self.packages."${system}"; - unstable-pkgs = unstable-pkgs.pkgs; }; overlays = [ my-overlay diff --git a/home-mods/desktop/default.nix b/home-mods/desktop/default.nix index eec9b06..bb13436 100644 --- a/home-mods/desktop/default.nix +++ b/home-mods/desktop/default.nix @@ -52,7 +52,7 @@ in element-desktop inkscape jellyfin-mpv-shim - pkgs.unstable-pkgs.warp-terminal + warp-terminal libsForQt5.kasts # miraclecast krita diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix index ed4970f..76f0498 100644 --- a/home-mods/shell/default.nix +++ b/home-mods/shell/default.nix @@ -22,6 +22,7 @@ let ]); in { + programs = { alacritty = { enable = true; @@ -43,12 +44,12 @@ in }; starship = { enable = true; - package = pkgs.unstable-pkgs.starship; + package = pkgs.starship; }; fish = { enable = true; - package = pkgs.unstable-pkgs.fish; + package = pkgs.fish; interactiveShellInit = '' any-nix-shell fish --info-right | source @@ -95,7 +96,7 @@ in commit.gpgsign = true; gpg.format = "ssh"; }; - package = pkgs.unstable-pkgs.git; + package = pkgs.git; }; nix-index = { @@ -105,7 +106,7 @@ in ssh = { enable = true; - package = pkgs.unstable-pkgs.openssh; + package = pkgs.openssh; matchBlocks = { "he4" = { @@ -132,13 +133,13 @@ in gpg = { enable = true; - package = pkgs.unstable-pkgs.gnupg; + package = pkgs.gnupg; }; zoxide = { enable = true; - package = pkgs.unstable-pkgs.zoxide; + package = pkgs.zoxide; }; }; @@ -181,9 +182,9 @@ in TERMINAL = "alacritty"; }; - packages = with pkgs.unstable-pkgs; [ + packages = with pkgs; [ myEmacs - asciinema + # asciinema any-nix-shell atool aspell @@ -212,9 +213,9 @@ in nodejs_20 tree pandoc - python311Full - python311Packages.epc - python311Packages.orjson + python312Full + python312Packages.epc + python312Packages.orjson rust-motd rcm (lib.mkIf config.services.gpg-agent.enable diff --git a/os-mods/desktop/printing.nix b/os-mods/desktop/printing.nix index 2b51e0a..13efbc8 100644 --- a/os-mods/desktop/printing.nix +++ b/os-mods/desktop/printing.nix @@ -9,7 +9,7 @@ drivers = with pkgs; [ gutenprint gutenprintBin - hplipWithPlugin + # hplipWithPlugin # TODO readd brlaser brgenml1cupswrapper ]; diff --git a/os-mods/netdata/default.nix b/os-mods/netdata/default.nix index 9c08135..542532e 100644 --- a/os-mods/netdata/default.nix +++ b/os-mods/netdata/default.nix @@ -9,7 +9,7 @@ # TODO allow primary/node config option to listen/send metrics to central location services.netdata = { enable = true; - package = pkgs.unstable-pkgs.netdata; + package = pkgs.netdata; python = { enable = true; diff --git a/systems/nixos-fw16/default.nix b/systems/nixos-fw16/default.nix index 69b6601..23b017c 100644 --- a/systems/nixos-fw16/default.nix +++ b/systems/nixos-fw16/default.nix @@ -167,6 +167,7 @@ ''; environment.systemPackages = with pkgs; [ + ryzenadj lm_sensors coreutils-full cpu-x @@ -179,7 +180,10 @@ enableRedistributableFirmware = true; i2c.enable = true; - cpu.amd.updateMicrocode = true; + cpu.amd = { + updateMicrocode = true; + ryzen-smu.enable = true; + }; sensor.iio.enable = true; };