From edb9e429305581095881a9e9504f46d44d726ec5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 31 Dec 2024 23:33:27 +0100 Subject: [PATCH] nixos-24.11 --- etcnixos/common.nix | 6 +- etcnixos/flake.lock | 136 +++------------------------------------- etcnixos/flake.nix | 11 +--- home-manager/flake.lock | 44 ++++++------- home-manager/flake.nix | 4 +- home-manager/gui.nix | 125 +++++++++++++++++++----------------- home-manager/no-gui.nix | 2 +- 7 files changed, 103 insertions(+), 225 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index ebc0ff0..48869fa 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -36,8 +36,7 @@ # kernel options boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; - # kernelPackages = pkgs.linuxPackages; + kernelPackages = pkgs.linuxPackages_latest; kernel.sysctl = { # dmesg shushhhhh @@ -79,7 +78,8 @@ # Enable CUPS to print documents. printing = { enable = true; - drivers = with pkgs; [ hplip ]; + # disabled, build broken + # drivers = with pkgs; [ hplip ]; }; # disable fprintd (doesn't compile, idk) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 3391bf8..b79e967 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -23,31 +23,6 @@ "type": "github" } }, - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": "home-manager_2", - "jovian": "jovian", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-small": "nixpkgs-small" - }, - "locked": { - "lastModified": 1734987419, - "narHash": "sha256-2K4V615Y29QhMUShX9k52l7gXF2erkq9yH9qGRZGKQ0=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "d61084b851dbf3072f8b40c3870b0f7938ca3f22", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1731098351, @@ -122,20 +97,6 @@ "type": "github" } }, - "flake-schemas": { - "locked": { - "lastModified": 1721999734, - "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=", - "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982", - "revCount": 75, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -179,49 +140,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734622215, - "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734725857, - "narHash": "sha256-bivlV9l/UjMtTfz/CZaoNJ5RfH2Lre4P9Ds64conoUQ=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "dbae2fd6adaf34c947d310bec08deac7c4ed265b", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -247,36 +165,13 @@ "type": "github" } }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "chaotic", - "jovian", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, "nixos-hardware": { "locked": { - "lastModified": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -288,32 +183,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-small": { - "locked": { - "lastModified": 1734838250, - "narHash": "sha256-Xi8ST/QiyuYXc3ujnMYOBuRUaMh6p16XWH6BKARa7xQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "da8a31d09dd004be34b5c54eda83f9a27b357726", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -364,7 +243,6 @@ "root": { "inputs": { "agenix": "agenix", - "chaotic": "chaotic", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index cda24ab..91c57ec 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -1,8 +1,8 @@ { - description = "A simple NixOS flake"; + description = "System nixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; # nixpkgs.url = "github:NixOS/nixpkgs/master"; lanzaboote = { @@ -12,11 +12,6 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - chaotic = { - url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -29,7 +24,6 @@ nixpkgs, lanzaboote, nixos-hardware, - chaotic, agenix, ... }@inputs: @@ -60,7 +54,6 @@ inherit pkgs; modules = [ ./system-${hostname}.nix - chaotic.nixosModules.default agenix.nixosModules.default ]; }; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 1d27cad..a6a2fb5 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1735053786, - "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1734988923, - "narHash": "sha256-DmCefR+2CwM0tdtJtpg1114kAwskNhyYyN8xoe/f9sI=", + "lastModified": 1735591802, + "narHash": "sha256-oAridSudDNmdIFXYAj7tikcU0NwM3RNSLY4Qu1Khv8A=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3d268c743b568febe83dc49e926f21b41b6d72d2", + "rev": "bdcb629b3a8d62b4aff1b0484f74d5ad33dcf544", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1734977336, - "narHash": "sha256-5klPkbBmEisNWWwnI4QYSum1syG5RyqBqEKNkHBA1ns=", + "lastModified": 1735586144, + "narHash": "sha256-YenL+60BJHF2cc4htz/iKEMgYd9dNfegzgH9tMBMhEY=", "owner": "YaLTeR", "repo": "niri", - "rev": "955039b5ea07c3fb2ff3278c0543004d86b7dcc7", + "rev": "4741ab2e0465275d58c36db426b169c742d964cf", "type": "github" }, "original": { @@ -127,27 +127,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1735007320, - "narHash": "sha256-NdhUgB9BkLGW9I+Q1GyUUCc3CbDgsg7HLWjG7WZBR5Q=", + "lastModified": 1735612067, + "narHash": "sha256-rsjojgfPUf9tWuMXuuo2KAIoUZ49XGZQJSjFGOO8Cq4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fb5fdba697ee9a2391ca9ceea3b853b4e3ce37a5", + "rev": "d199142e84bfaae476ffb4e09a70879d7918784d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1735042792, - "narHash": "sha256-L2kY/1dSrqFd+slZkp3M5jXEpwb+/6Vl3dCX/G3tf0s=", + "lastModified": 1735682290, + "narHash": "sha256-RFx8K81xEIca2zRvq5U7ufbB4BtX7NHbd32XM2Rd0mQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "21695ffb62a6b535b074753841eb2263b392ba80", + "rev": "b5e7bd3defc733771f8aad0532c39d567f8f2aed", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 0808bfd..e376bec 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -2,8 +2,8 @@ description = "My nixOS flake for home-manager"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 7f042c1..2a4a435 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -20,89 +20,96 @@ "apple_cursor" ]; - home.packages = - with pkgs; - [ - #calculator - gnome-calculator + home.packages = with pkgs; [ + #calculator + gnome-calculator - #productivity stuff - libreoffice - hunspell # spellcheck - hunspellDicts.en_US # spellcheck dictionary + #productivity stuff + libreoffice + hunspell # spellcheck + hunspellDicts.en_US # spellcheck dictionary - #video and audio downloading - parabolic + #video and audio downloading + parabolic - #soulseek client - nicotine-plus + #soulseek client + nicotine-plus - #dark web browsing deep web browsing - tor-browser + #dark web browsing deep web browsing + tor-browser - #audio editing - audacity + #audio editing + audacity - #fonts - noto-fonts - noto-fonts-emoji - liberation_ttf + #fonts + noto-fonts + noto-fonts-emoji + liberation_ttf - #for ebook reading - foliate + #for ebook reading + foliate - #audio mixer (pavucontrol but for pipewire) - pwvucontrol + #audio mixer (pavucontrol but for pipewire) + pwvucontrol - #minecraft launcher - prismlauncher + #minecraft launcher + prismlauncher - mpv - mumble - system76-keyboard-configurator + mpv + mumble + system76-keyboard-configurator - #jellyfin - finamp # music player - delfin # jellyfin client + #jellyfin + finamp # music player + delfin # jellyfin client - signal-desktop + signal-desktop - #accounting - gnucash + #accounting + # gnucash - # image tools - inkscape - nomacs + # image tools + inkscape + nomacs - # partitioning utilities - gparted - gnome-disk-utility + # partitioning utilities + gparted + gnome-disk-utility - # small nicities - wl-clipboard # wl-copy & wl-paste - libnotify # notifications library - xdg-utils # xdg utils + # small nicities + wl-clipboard # wl-copy & wl-paste + libnotify # notifications library + xdg-utils # xdg utils - # music tagging utility - picard + # music tagging utility + picard - # music lyric fetcher - lrcget + # music lyric fetcher + lrcget - inputs.zen-browser.packages."${system}" + inputs.zen-browser.packages."${system}".default - # freecad-wayland - puddletag + # freecad-wayland + puddletag - epiphany + epiphany - mcaselector + mcaselector - wireshark + wireshark - darktable - ] - ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); + darktable + rawtherapee + hugin + + nautilus + nufraw + + enblend-enfuse + + nerdfonts + ]; + # ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); programs.zed-editor = { enable = true; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index d633f9e..5816a1a 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -88,7 +88,7 @@ nixfmt-rfc-style # serial viewer - minicom + # minicom # "~~matt's~~ my trace route" mtr