From 563766b72c3c22b5d969ab7965ffe19d0edd5053 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Wed, 30 Aug 2023 20:58:52 +0000 Subject: [PATCH] Switch to unstable --- flake.lock | 32 +++++++----------------------- flake.nix | 16 ++++----------- home/neovim/default.nix | 4 ++-- sets/1password.nix | 4 ++-- sets/base.nix | 2 +- sets/fonts.nix | 4 ++-- sets/hardware.nix | 6 +++--- sets/packages.nix | 6 +++--- sets/sway.nix | 10 +++++----- sets/workstation.nix | 5 +---- system/rainbowdash/boot-config.nix | 4 ++-- system/spike/boot-config.nix | 4 ++-- system/starlight/boot-config.nix | 4 ++-- 13 files changed, 36 insertions(+), 65 deletions(-) diff --git a/flake.lock b/flake.lock index ce0350c..1bf516f 100644 --- a/flake.lock +++ b/flake.lock @@ -117,16 +117,15 @@ ] }, "locked": { - "lastModified": 1692099905, - "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", + "lastModified": 1693399033, + "narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", + "rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -175,16 +174,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692986144, - "narHash": "sha256-M4VFpy7Av9j+33HF5nIGm0k2+DXXW4qSSKdidIKg5jY=", + "lastModified": 1693377291, + "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=", "owner": "nixos", "repo": "nixpkgs", - "rev": "74e5bdc5478ebbe7ba5849f0d765f92757bb9dbf", + "rev": "e7f38be3775bab9659575f192ece011c033655f0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -205,22 +204,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1693003285, - "narHash": "sha256-5nm4yrEHKupjn62MibENtfqlP6pWcRTuSKrMiH9bLkc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5690c4271f2998c304a45c91a0aeb8fb69feaea7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -274,7 +257,6 @@ "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", "private": "private", "rustybar": "rustybar", "utils": "utils_2", diff --git a/flake.nix b/flake.nix index 6d58a06..3a2332c 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,6 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:nixos/nixos-hardware"; utils.url = "github:numtide/flake-utils"; @@ -11,7 +10,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-23.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -29,18 +28,11 @@ }; }; - outputs = { self, nixpkgs, home-manager, private, nixpkgs-unstable, utils, ... - }@inputs: + outputs = { self, nixpkgs, home-manager, private, utils, ... }@inputs: let makeSystem = conf: nixpkgs.lib.nixosSystem (nixpkgs.lib.recursiveUpdate conf rec { - specialArgs = { - inherit inputs; - pkgs-unstable = import nixpkgs-unstable { - config.allowUnfree = true; - system = conf.system; - }; - }; + specialArgs = { inherit inputs; }; modules = [ private.nixosModules.base home-manager.nixosModules.home-manager diff --git a/home/neovim/default.nix b/home/neovim/default.nix index 3323355..066e4d9 100644 --- a/home/neovim/default.nix +++ b/home/neovim/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, ... }: let lsp-colors = pkgs.vimUtils.buildVimPluginFrom2Nix { @@ -53,7 +53,7 @@ in { python3Packages.ipython python3Packages.pylint nodePackages.pyright - pkgs-unstable.rust-analyzer + rust-analyzer rnix-lsp ]; diff --git a/sets/1password.nix b/sets/1password.nix index 05be735..9541c56 100644 --- a/sets/1password.nix +++ b/sets/1password.nix @@ -1,9 +1,9 @@ -{ pkgs-unstable, ... }: +{ pkgs, ... }: { programs._1password-gui = { enable = true; - package = pkgs-unstable._1password-gui; + package = pkgs._1password-gui; polkitPolicyOwners = [ "artemis" ]; }; services.gnome.gnome-keyring.enable = true; diff --git a/sets/base.nix b/sets/base.nix index e592251..f4a5c2c 100644 --- a/sets/base.nix +++ b/sets/base.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, lib, ... }: +{ config, pkgs, lib, ... }: { nix = { diff --git a/sets/fonts.nix b/sets/fonts.nix index c87e5f0..0b1ba38 100644 --- a/sets/fonts.nix +++ b/sets/fonts.nix @@ -3,8 +3,8 @@ { fonts = { fontconfig.enable = true; - enableDefaultFonts = true; - fonts = with pkgs; [ + enableDefaultPackages = true; + packages = with pkgs; [ # MS fonts cantarell-fonts corefonts diff --git a/sets/hardware.nix b/sets/hardware.nix index 79f35b5..6ae7349 100644 --- a/sets/hardware.nix +++ b/sets/hardware.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, ... }: let jlink = pkgs.callPackage ../externals/packages/jlink { }; in { services.udev.packages = [ @@ -9,13 +9,13 @@ in { ]; environment.systemPackages = with pkgs; [ - pkgs-unstable.kicad + kicad openocd picocom stlink jlink platformio - pkgs-unstable.proxmark3-rrg + proxmark3-rrg ]; users = { diff --git a/sets/packages.nix b/sets/packages.nix index 3cd5454..a33142d 100644 --- a/sets/packages.nix +++ b/sets/packages.nix @@ -1,7 +1,7 @@ -{ config, pkgs, pkgs-unstable, lib, ... }: { +{ config, pkgs, lib, ... }: { environment.systemPackages = (with pkgs; [ # Audiovisual - pkgs-unstable.darktable + darktable exiftool flac lame @@ -125,6 +125,6 @@ # Wine and tools cabextract samba - pkgs-unstable.wineWowPackages.waylandFull + wineWowPackages.waylandFull ])); } diff --git a/sets/sway.nix b/sets/sway.nix index a216ed5..f0e6209 100644 --- a/sets/sway.nix +++ b/sets/sway.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: { +{ config, pkgs, ... }: { imports = [ ./fonts.nix ]; security.polkit.enable = true; services = { @@ -23,13 +23,13 @@ waypipe wf-recorder wl-clipboard - pkgs-unstable.wofi - pkgs-unstable.wofi-emoji + wofi + wofi-emoji xdg-user-dirs xdg_utils xsettingsd - pkgs-unstable.swaylock - pkgs-unstable.swayidle + swaylock + swayidle ]; hardware.opengl.enable = true; diff --git a/sets/workstation.nix b/sets/workstation.nix index 7297bcf..5090e6b 100644 --- a/sets/workstation.nix +++ b/sets/workstation.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, ... }: { imports = [ ./sway.nix ./packages.nix ./pipewire.nix ./base.nix ../home ]; @@ -18,7 +18,6 @@ nssmdns = true; }; flatpak.enable = true; - fwupd.enable = true; pcscd.enable = true; printing.enable = true; udev.packages = [ (pkgs.callPackage ../externals/rules/uhk.nix { }) ]; @@ -36,7 +35,5 @@ }; }; - nixpkgs.overlays = [ (final: prev: { brscan5 = pkgs-unstable.brscan5; }) ]; - users.users.artemis.extraGroups = [ "scanner" ]; } diff --git a/system/rainbowdash/boot-config.nix b/system/rainbowdash/boot-config.nix index c7f465d..b447588 100644 --- a/system/rainbowdash/boot-config.nix +++ b/system/rainbowdash/boot-config.nix @@ -1,8 +1,8 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, ... }: { boot = { - kernelPackages = pkgs-unstable.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_latest; kernel.sysctl."vm.swappiness" = 5; tmp.cleanOnBoot = true; blacklistedKernelModules = [ "psmouse" ]; diff --git a/system/spike/boot-config.nix b/system/spike/boot-config.nix index 5846783..b56e607 100644 --- a/system/spike/boot-config.nix +++ b/system/spike/boot-config.nix @@ -1,8 +1,8 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, ... }: { boot = { - kernelPackages = pkgs-unstable.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_latest; kernelParams = [ "fbcon=rotate:1" ]; kernel.sysctl."vm.swappiness" = 5; tmp.cleanOnBoot = true; diff --git a/system/starlight/boot-config.nix b/system/starlight/boot-config.nix index b966572..ae034a0 100644 --- a/system/starlight/boot-config.nix +++ b/system/starlight/boot-config.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, ... }: +{ config, pkgs, ... }: let net_opts = [ "x-systemd.automount" @@ -9,7 +9,7 @@ let ]; in { boot = { - kernelPackages = pkgs-unstable.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_latest; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; kernel.sysctl."vm.swappiness" = 5; tmp.cleanOnBoot = true;