diff --git a/flake.lock b/flake.lock index 301894a6..7e7b437e 100644 --- a/flake.lock +++ b/flake.lock @@ -37,27 +37,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1720852044, - "narHash": "sha256-3NBYz8VuXuKU+8ONd9NFafCNjPEGHIZQ2Mdoam1a4mY=", - "owner": "nix-community", - "repo": "fenix", - "rev": "5087b12a595ee73131a944d922f24d81dae05725", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "firefox-nightly": { "inputs": { "cachix": "cachix", @@ -69,11 +48,11 @@ ] }, "locked": { - "lastModified": 1720832575, - "narHash": "sha256-BJfwOsxQ8PYBB2Of9jK+42QE/M6JaDXi4xAptEjXC3w=", + "lastModified": 1720873541, + "narHash": "sha256-YjI3zVNBu93L6t/4oZid+S4a0QEeHk2IpVLgurSqDL8=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "887871e3232eb03be0f2a08ab4e68c03aa9f8323", + "rev": "e6b42ca70986702592fb9f6d23fe4472b52eb51c", "type": "github" }, "original": { @@ -113,38 +92,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -166,48 +113,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -264,33 +169,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_2", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1720524665, - "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -313,28 +191,6 @@ "type": "github" } }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "neovim-nightly-overlay", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "hardware": { "locked": { "lastModified": 1720737798, @@ -350,28 +206,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719226092, - "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -452,47 +286,6 @@ "type": "github" } }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-src": "neovim-src", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1720861673, - "narHash": "sha256-gh34LtCLvXCd/Xyk33mgQU3QqNyJ7ZwJj59c4Qdad78=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "34b8101a10dfb4cb38832a17ef33281d59e2b2b3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1720816717, - "narHash": "sha256-C8bdG2wrI29afHI1705W37M7CPudz5117YafiBlW0Y4=", - "owner": "neovim", - "repo": "neovim", - "rev": "10256bb760fcab0dc25f7eb5b0b45966cb771939", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1717794163, @@ -601,36 +394,16 @@ }, "root": { "inputs": { - "fenix": "fenix", "firefox-nightly": "firefox-nightly", "flake-utils": "flake-utils_2", "hardware": "hardware", "home-manager": "home-manager", "lanzaboote": "lanzaboote", - "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", - "rust-overlay": "rust-overlay_2", "systems": "systems_3" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1720717809, - "narHash": "sha256-6I+fm+nTLF/iaj7ffiFGlSY7POmubwUaPA/Wq0Bm53M=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "ffbc5ad993d5cd2f3b8bcf9a511165470944ab91", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "flake-utils": [ @@ -656,26 +429,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1720837122, - "narHash": "sha256-WMwo/kZ3o2h5Bls4dEyQ3XFZ4nw2UbbOUFpq3aVlkms=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "92f0608ab66c9770e931056b1c7a1b6249dbc43a", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index e5afb55f..d3f8890e 100644 --- a/flake.nix +++ b/flake.nix @@ -22,23 +22,19 @@ #}; # anyrun.url = "github:anyrun-org/anyrun"; # Neovim Nightly - neovim-nightly-overlay = { - url = "github:nix-community/neovim-nightly-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #neovim-nightly-overlay = { + # url = "github:nix-community/neovim-nightly-overlay"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; # Firefox Nightly firefox-nightly = { url = "github:nix-community/flake-firefox-nightly"; inputs.nixpkgs.follows = "nixpkgs"; }; - fenix = { - url = "github:nix-community/fenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + #fenix = { + # url = "github:nix-community/fenix"; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; }; outputs = { self, @@ -47,7 +43,6 @@ systems, lanzaboote, flake-utils, - rust-overlay, ... } @ inputs: let inherit (self) outputs; diff --git a/home/core/tui/git/adam.nix b/home/core/tui/git/adam.nix new file mode 100644 index 00000000..1c91b902 --- /dev/null +++ b/home/core/tui/git/adam.nix @@ -0,0 +1,7 @@ +{ + programs.git = { + enable = true; + userName = "adam"; + userEmail = "cnst@cana.st"; + }; +} diff --git a/home/core/tui/shell/adam.nix b/home/core/tui/shell/adam.nix index 4d273d33..3b719834 100644 --- a/home/core/tui/shell/adam.nix +++ b/home/core/tui/shell/adam.nix @@ -1,16 +1,19 @@ -{ config, ... }: -{ +{config, ...}: { programs.zsh = { enable = true; + dotDir = ".config/zsh"; enableCompletion = true; autosuggestion.enable = true; syntaxHighlighting.enable = true; shellAliases = { + nixdev = "nix develop ~/.nix-config -c $SHELL"; nixconfig = "cd /home/adam/.nix-config/"; ll = "ls -l"; - nixupdate = "sudo nixos-rebuild switch --flake .#adampad"; - flakeupdate = "nix flake update"; + nixupdate = "nh os switch -v -H cnix"; + nixup = "nh os switch -H cnix"; + flakeupdate = "nh os switch -u -v -H cnix"; + flakeup = "nh os switch -u -H cnix"; }; history = { size = 1000; @@ -20,16 +23,38 @@ enable = true; plugins = [ "git" - "thefuck" + # "thefuck" ]; theme = "robbyrussell"; }; + profileExtra = '' + export PATH="$HOME/.local/bin:$PATH" + ''; + initExtraFirst = '' + autoload -U colors && colors + ''; initExtra = '' - ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=241' - eval $(thefuck --alias) - eval $(thefuck --alias FUCK) + ZSH_THEME_GIT_PROMPT_PREFIX="%F{143}(%F{167}" + ZSH_THEME_GIT_PROMPT_SUFFIX="%f " + ZSH_THEME_GIT_PROMPT_DIRTY="%F{143}) %F{202}%1{✗%}" + ZSH_THEME_GIT_PROMPT_CLEAN="%F{143})" + + ZSH_THEME_RUBY_PROMPT_PREFIX="%F{167}‹" + ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f" + + PROMPT='%F{143}%~%f $(git_prompt_info)$(virtualenv_prompt_info) + %F{143}$ ' + + RPROMPT='$(ruby_prompt_info)' + + VIRTUAL_ENV_DISABLE_PROMPT=0 + ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=" %F{66}🐍 " + ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="%f" + ZSH_THEME_VIRTUALENV_PREFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX + ZSH_THEME_VIRTUALENV_SUFFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX + + ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=241' - eval "$(zellij setup --generate-auto-start zsh)" ''; }; } diff --git a/home/extra/neovim/default.nix b/home/extra/neovim/default.nix index d36b9847..e8bd573c 100644 --- a/home/extra/neovim/default.nix +++ b/home/extra/neovim/default.nix @@ -93,7 +93,8 @@ in { programs.neovim = { enable = true; defaultEditor = true; - package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default; + package = pkgs.neovim-unwrapped; + #package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default; plugins = with pkgs.vimPlugins; [telescope-cheat-nvim]; inherit extraPackages; }; diff --git a/home/users/adam/home.nix b/home/users/adam/home.nix index 9387ecec..01e0dbdb 100644 --- a/home/users/adam/home.nix +++ b/home/users/adam/home.nix @@ -1,5 +1,3 @@ -# This is your home-manager configuration file -# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix) { inputs, lib, @@ -7,10 +5,8 @@ pkgs, ... }: { - # You can import other home-manager modules here imports = [ - ../../core/adam.nix - ../../extra/adam.nix + ./imports.nix ]; nix = { @@ -19,7 +15,6 @@ experimental-features = [ "nix-command" "flakes" - "ca-derivations" ]; warn-dirty = false; }; diff --git a/home/users/adam/imports.nix b/home/users/adam/imports.nix new file mode 100644 index 00000000..6941711f --- /dev/null +++ b/home/users/adam/imports.nix @@ -0,0 +1,64 @@ +{pkgs, ...}: { + imports = [ + # core.gui + ../../core/gui/gtk + ../../core/gui/mako + ../../core/gui/waybar + ../../core/gui/xdg + # core.tui + ../../core/tui/git/adam.nix + ../../core/tui/shell/adam.nix + # core.system + ../../core/system/polkit.nix + + # extra + ../../extra/foot + ../../extra/firefox + ../../extra/neovim + ]; + home = { + packages = with pkgs; [ + # misc.gui + file-roller + gnome-calculator + keepassxc + nwg-look + oculante + pavucontrol + qbittorrent + virt-manager + webcord + xfce.thunar + + # misc.tui + alacritty + btop + calcurse + fastfetch + htop + ranger + + # misc.system + adwaita-icon-theme + grimblast + hyprpicker + networkmanagerapplet + pamixer + qt5.qtwayland + qt6.qtwayland + slurp + swaybg + # thefuck + wireguard-tools + wl-clipboard + wpa_supplicant + xfce.thunar-archive-plugin + xfce.thunar-volman + ]; + sessionVariables = { + BROWSER = "firefox"; + EDITOR = "nvim"; + TERM = "foot"; + }; + }; +} diff --git a/nixos/core/shells/dev.nix b/nixos/core/shells/dev.nix index 2ffec318..77cc33b9 100644 --- a/nixos/core/shells/dev.nix +++ b/nixos/core/shells/dev.nix @@ -1,21 +1,16 @@ {pkgs ? import {}, ...}: { default = pkgs.mkShell { + NIX_CONFIG = "extra-experimental-features = nix-command flakes"; nativeBuildInputs = with pkgs; [ - _rustBuild - ]; - buildInputs = with pkgs; [ - # rust-bin.stable.latest.default + rust-analyzer + cargo + clippy + rustc + rustfmt openssl pkg-config - ez - fd gtk3 gtk4 ]; - shellHook = '' - alias ls=eza - alias find=fd - ''; - RUST_BACKTRACE = 1; }; } diff --git a/nixos/hosts/adampad/default.nix b/nixos/hosts/adampad/default.nix index 72e3d043..fe06c20b 100644 --- a/nixos/hosts/adampad/default.nix +++ b/nixos/hosts/adampad/default.nix @@ -22,20 +22,26 @@ in { "mysql" "docker" "libvirtd" + "qemu-libvirtd" + "kvm" "network" + "adbusers" + "rtkit" + "users" + "plocate" ]; }; + programs.dconf.enable = true; + imports = [ inputs.home-manager.nixosModules.home-manager - ../core - ../services/adampad.nix - ../hardware/adampad.nix - ../locale/adampad.nix + ./imports.nix + ./system.nix ./hardware-configuration.nix ]; - home-manager.users.adam = import ../../home/adam/home.nix; + home-manager.users.adam = import ../../../home/users/adam/home.nix; nix = let flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs; in { @@ -62,23 +68,18 @@ in { # Bootloader boot.loader = { - systemd-boot.enable = true; + systemd-boot.enable = lib.mkForce false; efi.canTouchEfiVariables = true; }; + # Enable networking networking = { networkmanager.enable = true; hostName = "adampad"; }; - # Garbage collector / Nix helper - programs = { - nh = { - enable = true; - clean.enable = true; - clean.extraArgs = "--keep-since 4d --keep 3"; - flake = "/home/adam/.nix-config"; - }; + environment.sessionVariables = { + FLAKE = "/home/adam/.nix-config"; }; # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion diff --git a/nixos/hosts/adampad/hardware-configuration.nix b/nixos/hosts/adampad/hardware-configuration.nix index b61bbd23..16c85c84 100644 --- a/nixos/hosts/adampad/hardware-configuration.nix +++ b/nixos/hosts/adampad/hardware-configuration.nix @@ -7,10 +7,8 @@ pkgs, modulesPath, ... -}: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; +}: { + imports = [(modulesPath + "/installer/scan/not-detected.nix")]; boot = { initrd = { @@ -22,16 +20,17 @@ "usb_storage" "sd_mod" ]; - kernelModules = [ ]; + kernelModules = ["amdgpu"]; }; - kernelModules = [ "kvm-amd" ]; - kernelPackages = pkgs.linuxPackages_latest; + kernelModules = ["kvm-amd"]; + kernelPackages = pkgs.linuxPackages_zen; consoleLogLevel = 3; kernelParams = [ "quiet" "splash" + "amdgpu.ppfeaturemask=0xffffffff" ]; - extraModulePackages = [ ]; + extraModulePackages = []; }; fileSystems."/" = { @@ -50,7 +49,7 @@ ]; }; - swapDevices = [ ]; + swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/nixos/hosts/adampad/imports.nix b/nixos/hosts/adampad/imports.nix new file mode 100644 index 00000000..2e182b69 --- /dev/null +++ b/nixos/hosts/adampad/imports.nix @@ -0,0 +1,85 @@ +{pkgs, ...}: { + imports = [ + # core + ../../core/adb.nix + ../../core/fonts.nix + ../../core/hyprland.nix + ../../core/zsh.nix + + # hardware + ../../hardware/adampad.nix + + # locale + ../../locale/adampad.nix + + # services + ../../services/blueman.nix + ../../services/dbus.nix + ../../services/gnome-keyring.nix + ../../services/greetd.nix + ../../services/gvfs.nix + ../../services/mullvad.nix + ../../services/openssh.nix + ../../services/pipewire.nix + ../../services/udisks.nix + ../../services/xserver.nix + ../../services/locate.nix + ../../services/fwupd.nix + + # extra + #../../extra/gaming.nix + #../../extra/workstation + # ../../extra/nix-ld + ]; + + environment = { + systemPackages = with pkgs; [ + # Core + fd + git + niv + nix-output-monitor + nvd + sbctl + + # Util + anyrun + curl + fzf + gnome-disk-utility + killall + lazygit + ntfs3g + p7zip + ripgrep + stow + tmux + tmuxifier + tree-sitter + udiskie + unrar + unzip + wget + wlroots + xdg-user-dirs + xdg-utils + + # Dev + binutils + clang + clang-tools + cargo-edit + cargo-insta + cargo-nextest + gcc + gnumake + cmake + hyprlang + python3 + python312Packages.httplib2 + python312Packages.oauth2 + gtk3 + gtk4 + ]; + }; +} diff --git a/nixos/hosts/adampad/system.nix b/nixos/hosts/adampad/system.nix new file mode 100644 index 00000000..00995ab6 --- /dev/null +++ b/nixos/hosts/adampad/system.nix @@ -0,0 +1,37 @@ +{ + inputs, + outputs, + ... +}: { + programs = { + nh = { + enable = true; + clean.enable = true; + clean.extraArgs = "--keep-since 4d --keep 3"; + flake = "/home/adam/.nix-config"; + }; + }; + security.rtkit.enable = true; + + environment.localBinInPath = true; + + console.useXkbConfig = true; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = { + inherit inputs outputs; + }; + }; + nixpkgs = { + overlays = [ + (_: prev: { + python312 = prev.python312.override {packageOverrides = _: pysuper: {nose = pysuper.pynose;};}; + }) + ]; + config = { + allowUnfree = true; + input-fonts.acceptLicense = true; + }; + }; +} diff --git a/nixos/hosts/adampad/xkb/symbols/hhkbse b/nixos/hosts/adampad/xkb/symbols/hhkbse index c2c387d5..f636b3d4 100644 --- a/nixos/hosts/adampad/xkb/symbols/hhkbse +++ b/nixos/hosts/adampad/xkb/symbols/hhkbse @@ -5,20 +5,20 @@ xkb_symbols "hhkbse" { name[Group1]="Sweden - HHKBse"; - key {[ 1, exclam, paragraph, onehalf ]}; - key {[ 2, quotedbl, at ]}; + key {[ 1, exclam, section, onehalf ]}; + key {[ 2, quotedbl, at, paragraph ]}; key {[ 3, numbersign, sterling ]}; key {[ 4, dollar, currency ]}; - key {[ 5, percent, EuroSign ]}; + key {[ 5, percent, EuroSign, permille ]}; key {[ 6, ampersand, yen, radical ]}; key {[ 7, slash, braceleft ]}; key {[ 8, parenleft, bracketleft ]}; key {[ 9, parenright, bracketright ]}; key {[ 0, equal, braceright ]}; - key {[ plus, question, backslash, questiondown ]}; + key {[ plus, question, backslash, plusminus ]}; key {[ Next, braceleft, Home ]}; key {[ Prior, braceright, End ]}; - key {[ Delete, asterisk, asciicircum ]}; + key {[ Delete,asciicircum, asterisk ]}; key {[ q, Q ]}; key {[ w, W ]}; @@ -50,8 +50,8 @@ xkb_symbols "hhkbse" { key {[ v, V ]}; key {[ b, B ]}; key {[ n, N ]}; - key {[ m, M, mu ]}; + key {[ m, M ]}; key {[ comma, semicolon ]}; - key {[ period, colon ]}; + key {[ period, colon, ellipsis ]}; key {[ minus, underscore, endash ]}; }; diff --git a/nixos/hosts/cnix/system.nix b/nixos/hosts/cnix/system.nix index 2bf9ea68..249e24ff 100644 --- a/nixos/hosts/cnix/system.nix +++ b/nixos/hosts/cnix/system.nix @@ -24,7 +24,7 @@ }; }; nixpkgs = { - overlays = with inputs; [ + overlays = [ (_: prev: { python312 = prev.python312.override {packageOverrides = _: pysuper: {nose = pysuper.pynose;};}; })