From a4dd272bb1aa1b9efcbaa8a3a685aba6c6499165 Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Thu, 23 Nov 2023 01:21:58 -0800 Subject: [PATCH] update from NixOS 23.05 to NixOS unstable --- provision/flake.lock | 43 ++++++------------- provision/flake.nix | 19 +++----- provision/hosts/bulwark/configuration.nix | 6 +-- .../hosts/bulwark/home-configuration.nix | 2 +- provision/hosts/bulwark/steam-deck.nix | 2 +- provision/hosts/bulwark/syncthing.nix | 5 ++- provision/hosts/kestrel/configuration.nix | 6 +-- .../hosts/kestrel/home-configuration.nix | 2 +- provision/hosts/kestrel/syncthing.nix | 5 ++- provision/hosts/torus/configuration.nix | 2 +- provision/hosts/torus/home-configuration.nix | 2 +- provision/hosts/torus/syncthing.nix | 5 ++- provision/modules/desktop/browser.nix | 4 +- provision/modules/desktop/sway.nix | 2 +- provision/modules/devel/engineering.nix | 5 +-- provision/modules/devel/notes.nix | 5 +-- provision/modules/gaming/steam.nix | 20 ++++----- provision/modules/system/terminal.nix | 12 +++--- 18 files changed, 61 insertions(+), 86 deletions(-) diff --git a/provision/flake.lock b/provision/flake.lock index ef0be1b4..e8587f7e 100644 --- a/provision/flake.lock +++ b/provision/flake.lock @@ -7,16 +7,15 @@ ] }, "locked": { - "lastModified": 1700392168, - "narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", + "lastModified": 1700695018, + "narHash": "sha256-MAiPLgBF4GLzSOlhnPCDWkWW5CDx4i7ApIYaR+TwTVg=", "owner": "nix-community", "repo": "home-manager", - "rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", + "rev": "134deb46abd5d0889d913b8509413f6f38b0811e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -24,31 +23,32 @@ "jovian-nixos": { "flake": false, "locked": { - "lastModified": 1698485410, - "narHash": "sha256-+O5Acu2n4XQnT4M25W/oH5MLqXy4pFBFhBzKBFOF7Ik=", - "rev": "fd7753956149d4e8b19a810eed445d1a52aecd30", - "revCount": 459, + "lastModified": 1700377627, + "narHash": "sha256-MrYHE/oWqVVwyV9n2MbtAHWplCkLvCcvLj3TOkyHD5k=", + "ref": "development", + "rev": "1ccd4c94521ef7e6678f9d918dbee703d116dd76", + "revCount": 514, "type": "git", "url": "https://github.com/Jovian-Experiments/Jovian-NixOS" }, "original": { - "rev": "fd7753956149d4e8b19a810eed445d1a52aecd30", + "ref": "development", "type": "git", "url": "https://github.com/Jovian-Experiments/Jovian-NixOS" } }, "nixpkgs": { "locked": { - "lastModified": 1700272409, - "narHash": "sha256-Mge6iOvomplBsvQ47sIeVAwAUGSVXH4qCW4pLUt/qMI=", + "lastModified": 1700390070, + "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8e5e424b1c059e9ccf5db6a652458e30de05fa3a", + "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -69,22 +69,6 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1700108881, @@ -106,7 +90,6 @@ "home-manager": "home-manager", "jovian-nixos": "jovian-nixos", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", "sops-nix": "sops-nix" } }, diff --git a/provision/flake.nix b/provision/flake.nix index 250f53e4..d82a89f2 100644 --- a/provision/flake.nix +++ b/provision/flake.nix @@ -2,37 +2,32 @@ description = "Flake for nixos configurations"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = github:nix-community/home-manager/release-23.05; + url = github:nix-community/home-manager; inputs.nixpkgs.follows = "nixpkgs"; }; jovian-nixos = { - url = "git+https://github.com/Jovian-Experiments/Jovian-NixOS?rev=fd7753956149d4e8b19a810eed445d1a52aecd30"; + url = "git+https://github.com/Jovian-Experiments/Jovian-NixOS?ref=development"; flake = false; }; sops-nix.url = "github:Mic92/sops-nix"; }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, home-manager, jovian-nixos, sops-nix, ... }: + outputs = inputs @ { self, nixpkgs, home-manager, jovian-nixos, sops-nix, ... }: let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; config.allowUnfree = true; }; - pkgs-unstable = import nixpkgs-unstable { - inherit system; - config.allowUnfree = true; - }; lib = nixpkgs.lib; user = "tstarr"; in { nixosConfigurations = { kestrel = lib.nixosSystem { inherit system; - specialArgs = { inherit user; inherit pkgs-unstable; }; + specialArgs = { inherit user; }; modules = [ ./modules ./hosts/kestrel/configuration.nix @@ -54,7 +49,7 @@ torus = lib.nixosSystem { inherit system; - specialArgs = { inherit user; inherit pkgs-unstable; }; + specialArgs = { inherit user; }; modules = [ ./modules ./hosts/torus/configuration.nix @@ -76,7 +71,7 @@ bulwark = lib.nixosSystem { inherit system; - specialArgs = { inherit user; inherit pkgs-unstable; inherit jovian-nixos; inherit home-manager; }; + specialArgs = { inherit user; inherit jovian-nixos; inherit home-manager; }; modules = [ ./modules ./hosts/bulwark/configuration.nix diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix index f42a3a98..36fc2e16 100644 --- a/provision/hosts/bulwark/configuration.nix +++ b/provision/hosts/bulwark/configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs-unstable, user, ... }: +{ config, lib, pkgs, user, ... }: { imports = [ ./steam-deck.nix @@ -42,7 +42,7 @@ i18n.defaultLocale = "en_US.UTF-8"; # Add fonts - fonts.fonts = with pkgs; [ + fonts.packages= with pkgs; [ nerdfonts ]; @@ -99,5 +99,5 @@ }; # Did you read the comment? - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } diff --git a/provision/hosts/bulwark/home-configuration.nix b/provision/hosts/bulwark/home-configuration.nix index 4b38b045..75c59a67 100644 --- a/provision/hosts/bulwark/home-configuration.nix +++ b/provision/hosts/bulwark/home-configuration.nix @@ -18,5 +18,5 @@ #modules = { #}; - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/provision/hosts/bulwark/steam-deck.nix b/provision/hosts/bulwark/steam-deck.nix index 91586b94..eb93e1ed 100644 --- a/provision/hosts/bulwark/steam-deck.nix +++ b/provision/hosts/bulwark/steam-deck.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs-unstable, user, jovian-nixos, home-manager, ... }: +{ config, lib, pkgs, user, jovian-nixos, home-manager, ... }: { imports = [ (jovian-nixos + "/modules") diff --git a/provision/hosts/bulwark/syncthing.nix b/provision/hosts/bulwark/syncthing.nix index a06ac1d9..d35afe12 100644 --- a/provision/hosts/bulwark/syncthing.nix +++ b/provision/hosts/bulwark/syncthing.nix @@ -8,14 +8,15 @@ services.syncthing = { enable = true; user = "${user}"; + dataDir = "/home/${user}"; configDir = "/home/${user}/.config/syncthing"; guiAddress = "0.0.0.0:8384"; overrideDevices = true; overrideFolders = true; - devices = { + settings.devices = { "kestrel" = { id = "TY6I6UK-YWXZYB4-7DKSB5Y-6ZBGE6U-T5WNJK4-KPLTXP7-ZTZQPXU-LX4HPQZ"; }; }; - folders = { + settings.folders = { "Gamecube Saves" = { path = "/home/${user}/.local/share/dolphin-emu/GC"; devices = [ "kestrel" ]; diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix index 8dd72ca0..b4f789ae 100644 --- a/provision/hosts/kestrel/configuration.nix +++ b/provision/hosts/kestrel/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, pkgs-unstable, user, lib, ... }: +{ config, pkgs, user, lib, ... }: { imports = [ ./syncthing.nix @@ -44,7 +44,7 @@ i18n.defaultLocale = "en_US.UTF-8"; # Add fonts - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ nerdfonts ]; @@ -111,5 +111,5 @@ }; # Did you read the comment? - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } diff --git a/provision/hosts/kestrel/home-configuration.nix b/provision/hosts/kestrel/home-configuration.nix index 8cf1a58c..6ab1009f 100644 --- a/provision/hosts/kestrel/home-configuration.nix +++ b/provision/hosts/kestrel/home-configuration.nix @@ -28,5 +28,5 @@ }; }; - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/provision/hosts/kestrel/syncthing.nix b/provision/hosts/kestrel/syncthing.nix index 546a62d1..c8593ac4 100644 --- a/provision/hosts/kestrel/syncthing.nix +++ b/provision/hosts/kestrel/syncthing.nix @@ -8,15 +8,16 @@ services.syncthing = { enable = true; user = "${user}"; + dataDir = "/home/${user}"; configDir = "/home/${user}/.config/syncthing"; guiAddress = "0.0.0.0:8384"; overrideDevices = true; overrideFolders = true; - devices = { + settings.devices = { "bulwark" = { id = "B5HZK2V-WA4WSQF-3JAIH4I-C6XQZ6J-EMMAIV5-CCYOA5G-N57GT6A-WH2GCQ2"; }; "torus" = { id = "WCZYHD7-5Y33SSU-74JHAQR-V7LYMDM-SDG2NTN-DJ2VKF2-DUBBUE5-PU5CGQN"; }; }; - folders = { + settings.folders = { "Gamecube Saves" = { path = "/home/${user}/.local/share/dolphin-emu/GC"; devices = [ "bulwark" ]; diff --git a/provision/hosts/torus/configuration.nix b/provision/hosts/torus/configuration.nix index f85ebe42..1de9bdbe 100644 --- a/provision/hosts/torus/configuration.nix +++ b/provision/hosts/torus/configuration.nix @@ -154,5 +154,5 @@ }; }; # Did you read the comment? - system.stateVersion = "23.05"; + system.stateVersion = "23.11"; } diff --git a/provision/hosts/torus/home-configuration.nix b/provision/hosts/torus/home-configuration.nix index 83d809a6..9d1a125d 100644 --- a/provision/hosts/torus/home-configuration.nix +++ b/provision/hosts/torus/home-configuration.nix @@ -13,5 +13,5 @@ #modules = { #}; - home.stateVersion = "23.05"; + home.stateVersion = "23.11"; } diff --git a/provision/hosts/torus/syncthing.nix b/provision/hosts/torus/syncthing.nix index 4d432175..cbd4973d 100644 --- a/provision/hosts/torus/syncthing.nix +++ b/provision/hosts/torus/syncthing.nix @@ -8,14 +8,15 @@ services.syncthing = { enable = true; user = "${user}"; + dataDir = "/home/${user}"; configDir = "/home/${user}/.config/syncthing"; guiAddress = "0.0.0.0:8384"; overrideDevices = true; overrideFolders = true; - devices = { + settings.devices = { "kestrel" = { id = "TY6I6UK-YWXZYB4-7DKSB5Y-6ZBGE6U-T5WNJK4-KPLTXP7-ZTZQPXU-LX4HPQZ"; }; }; - folders = { + settings.folders = { }; }; } diff --git a/provision/modules/desktop/browser.nix b/provision/modules/desktop/browser.nix index 1772c6ab..8a9d1f91 100644 --- a/provision/modules/desktop/browser.nix +++ b/provision/modules/desktop/browser.nix @@ -1,11 +1,11 @@ -{ config, lib, pkgs, pkgs-unstable, user, ... }: +{ config, lib, pkgs, user, ... }: let cfg = config.modules.desktop.browser; in { options.modules.desktop.browser.enable = lib.mkEnableOption "browser"; config = lib.mkIf cfg.enable { - environment.systemPackages = with pkgs-unstable; [ + environment.systemPackages = with pkgs; [ chromium google-chrome play-with-mpv diff --git a/provision/modules/desktop/sway.nix b/provision/modules/desktop/sway.nix index ce201e18..b00db3c0 100644 --- a/provision/modules/desktop/sway.nix +++ b/provision/modules/desktop/sway.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs-unstable, user, ... }: +{ config, lib, pkgs, user, ... }: let cfg = config.modules.desktop.sway; diff --git a/provision/modules/devel/engineering.nix b/provision/modules/devel/engineering.nix index 5bef16ee..87fa3d06 100644 --- a/provision/modules/devel/engineering.nix +++ b/provision/modules/devel/engineering.nix @@ -1,6 +1,6 @@ # CAD and 3d printing and everything nice -{ config, lib, pkgs, pkgs-unstable, user, ... }: +{ config, lib, pkgs, user, ... }: let cfg = config.modules.devel.engineering; @@ -11,9 +11,6 @@ in { environment.systemPackages = with pkgs; [ super-slicer blender - ] ++ [ - # Freecad is broken right now (https://github.com/NixOS/nixpkgs/issues/263452) - #pkgs-unstable.freecad ]; }; } diff --git a/provision/modules/devel/notes.nix b/provision/modules/devel/notes.nix index 23c4d1f3..00fe8e1e 100644 --- a/provision/modules/devel/notes.nix +++ b/provision/modules/devel/notes.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs-unstable, user, ... }: +{ config, lib, pkgs, user, ... }: let cfg = config.modules.devel.notes; @@ -8,12 +8,11 @@ in { environment.systemPackages = with pkgs; [ pandoc gollum + obsidian zk # for zk bat fzf - ] ++ [ - pkgs-unstable.obsidian ]; }; } diff --git a/provision/modules/gaming/steam.nix b/provision/modules/gaming/steam.nix index 1ada63b0..af963ac8 100644 --- a/provision/modules/gaming/steam.nix +++ b/provision/modules/gaming/steam.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs-unstable, user, ... }: +{ config, lib, pkgs, user, ... }: let cfg = config.modules.gaming.steam; in { @@ -14,15 +14,15 @@ in { hardware.steam-hardware.enable = true; - environment.systemPackages = [ - pkgs.steam - pkgs.steamtinkerlaunch - pkgs.yuzu-early-access - pkgs.dolphin-emu - pkgs.ppsspp - pkgs.mgba - pkgs-unstable.sunshine - pkgs-unstable.moonlight-qt + environment.systemPackages = with pkgs; [ + steam + steamtinkerlaunch + yuzu-early-access + dolphin-emu + ppsspp + mgba + sunshine + moonlight-qt ]; }; diff --git a/provision/modules/system/terminal.nix b/provision/modules/system/terminal.nix index ae50fecb..8fc6c2f9 100644 --- a/provision/modules/system/terminal.nix +++ b/provision/modules/system/terminal.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, pkgs-unstable, user, ... }: +{ config, lib, pkgs, user, ... }: let cfg = config.modules.system.terminal; in { @@ -34,14 +34,12 @@ in { # for neovim nodejs ripgrep - # taskwarrior - taskopen - ] ++ [ - pkgs-unstable.taskwarrior + taskwarrior # for taskwarrior - pkgs-unstable.taskwarrior-tui - pkgs-unstable.timewarrior + taskopen + taskwarrior-tui + timewarrior ]; };