From da865671ad393de543266984614a2deaca1549a9 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Sat, 11 May 2024 23:42:45 -0600 Subject: [PATCH] [NixOS] Flake update --- nixos/base.nix | 4 -- nixos/desktop.nix | 2 +- nixos/flake.lock | 162 +++++++++++++++++++++++++++++++++------------- nixos/gnome.nix | 2 +- nixos/plasma.nix | 2 +- 5 files changed, 119 insertions(+), 53 deletions(-) diff --git a/nixos/base.nix b/nixos/base.nix index 0bf5083e..963348e5 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -33,10 +33,6 @@ makeEnable config "modules.base" true { enable = true; enableStrongSwan = true; plugins = [ pkgs.networkmanager-l2tp pkgs.networkmanager-openvpn ]; - extraConfig = '' - [main] - rc-manager=resolvconf - ''; }; # Audio diff --git a/nixos/desktop.nix b/nixos/desktop.nix index a5d0b982..b77c3b15 100644 --- a/nixos/desktop.nix +++ b/nixos/desktop.nix @@ -1,4 +1,4 @@ -{ config, pkgs, makeEnable, forEachUser, ... }: +{ config, pkgs, makeEnable, ... }: makeEnable config "modules.desktop" true { imports = [ ./fonts.nix diff --git a/nixos/flake.lock b/nixos/flake.lock index 72bd5e50..560f63a5 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -108,6 +108,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "nixified-ai", @@ -128,7 +149,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixified-ai", @@ -170,15 +191,12 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -188,6 +206,24 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "inputs": { "systems": "systems_3" }, @@ -205,7 +241,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { "systems": "systems_5" }, @@ -223,7 +259,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "inputs": { "systems": "systems_6" }, @@ -465,7 +501,7 @@ "haskell-language-server": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "fourmolu-011": "fourmolu-011", "fourmolu-012": "fourmolu-012", "gitignore": "gitignore", @@ -500,7 +536,7 @@ "haskell-language-server_2": { "inputs": { "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "fourmolu-011": "fourmolu-011_2", "fourmolu-012": "fourmolu-012_2", "gitignore": "gitignore_2", @@ -534,7 +570,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": [ "nixified-ai", "nixpkgs" @@ -664,11 +700,11 @@ ] }, "locked": { - "lastModified": 1710452332, - "narHash": "sha256-+lKOoQ89fD6iz6Ro7Adml4Sx6SqQcTWII4t1rvVtdjs=", + "lastModified": 1715380449, + "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "096d9c04b3e9438855aa65e24129b97a998bd3d9", + "rev": "d7682620185f213df384c363288093b486b2883f", "type": "github" }, "original": { @@ -811,16 +847,18 @@ "nix": { "inputs": { "flake-compat": "flake-compat", + "flake-parts": "flake-parts", "libgit2": "libgit2", "nixpkgs": "nixpkgs_2", - "nixpkgs-regression": "nixpkgs-regression" + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1710366336, - "narHash": "sha256-eJeZ3vMbuC351B6CH4mqcpuZJ9RgtdRcxvhd7X2++Nk=", + "lastModified": 1715361977, + "narHash": "sha256-j/PLYYGs+Gjge4JGYxMjOhWQEp+GB4Fdicetbpmp6n0=", "owner": "NixOS", "repo": "nix", - "rev": "c152c2767a262b772c912287e1c2d85173b4781c", + "rev": "87ab3c0ea4e6f85e7b902050365bb75cf2836fbb", "type": "github" }, "original": { @@ -830,7 +868,7 @@ }, "nixified-ai": { "inputs": { - "flake-parts": "flake-parts", + "flake-parts": "flake-parts_2", "hercules-ci-effects": "hercules-ci-effects", "invokeai-src": "invokeai-src", "nixpkgs": "nixpkgs_3", @@ -868,15 +906,15 @@ "nixos-wsl": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1709980437, - "narHash": "sha256-rp1MwfRaZl7TPM4E5i1HxQGJCCfMcIa7dOzTX3SW7ro=", + "lastModified": 1715237610, + "narHash": "sha256-/ZeWQ4mL3DfHsbTZYc80qMrL4vBfENP0RiGv2KrCrEo=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "e0b9e6c8ff35c7a28cb6baa02d85a9737a2ee4e9", + "rev": "61fe33f4194bbbc48c090a2e79f4eb61b47c9b75", "type": "github" }, "original": { @@ -919,11 +957,11 @@ }, "nixpkgs-regression_2": { "locked": { - "lastModified": 1710455890, - "narHash": "sha256-Ecfz+YhCEtj0KZhI90fiW21QqneOd5HpvMeJGzlN72Y=", + "lastModified": 1715484633, + "narHash": "sha256-Es5etYksi9VsAZSBKZe4rdyi9L000MEx9lFb3TF6Eo8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30ccdc28ecb2060cfe01d679aa8a4304631a41b5", + "rev": "25e9a6d07dd142bafd94603208a59c107e8f2905", "type": "github" }, "original": { @@ -966,11 +1004,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1707514827, - "narHash": "sha256-Y+wqFkvikpE1epCx57PsGw+M1hX5aY5q/xgk+ebDwxI=", + "lastModified": 1714782413, + "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f65b86b6485decb43c5498780c223571dd56ef", + "rev": "651b4702e27a388f0f18e1b970534162dec09aff", "type": "github" }, "original": { @@ -982,11 +1020,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -1117,6 +1155,38 @@ "url": "https://hackage.haskell.org/package/ormolu-0.7.1.0/ormolu-0.7.1.0.tar.gz" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "nix" + ], + "flake-utils": "flake-utils_2", + "gitignore": [ + "nix" + ], + "nixpkgs": [ + "nix", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -1334,11 +1404,11 @@ ] }, "locked": { - "lastModified": 1706639324, - "narHash": "sha256-O5T4/1+dERQitmA6pwcP67/tREcJQ7KuATD8kGiB2Es=", + "lastModified": 1714656757, + "narHash": "sha256-OZNPY2LNBm+NkIHqo8SX2f/BfuwqkQIGYePkiAmz2YA=", "owner": "taffybar", "repo": "taffybar", - "rev": "9c8540a56432db6555755a9a649b4874833520ed", + "rev": "a82a8a0cffb34b5eae38e46d88f02641bf8a8fe5", "type": "github" }, "original": { @@ -1366,11 +1436,11 @@ }, "unstable": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -1382,7 +1452,7 @@ }, "vscode-server": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": "nixpkgs_8" }, "locked": { @@ -1413,11 +1483,11 @@ "unstable": "unstable" }, "locked": { - "lastModified": 1710184205, - "narHash": "sha256-vcDr/l0dohzk1ZtWdMGK9j7QUNS7RpdwmA1Mku/r6CY=", + "lastModified": 1714229485, + "narHash": "sha256-AOy87dJL0T9wSe1kM0tTzFlV++JwmoGW4BfBXzIUbsI=", "owner": "xmonad", "repo": "xmonad", - "rev": "746880e9b9bb4eecc6e89e26f760cfbdf1464fed", + "rev": "cde1a25bca9b7aeeb24af73588221f5f54ae770b", "type": "github" }, "original": { diff --git a/nixos/gnome.nix b/nixos/gnome.nix index 6b76a19f..dfcde785 100644 --- a/nixos/gnome.nix +++ b/nixos/gnome.nix @@ -1,7 +1,7 @@ { config, makeEnable, ... }: makeEnable config "modules.gnome" false { services.xserver = { - desktopManager.gnome3.enable = true; + desktopManager.gnome.enable = true; displayManager.gdm.enable = true; }; } diff --git a/nixos/plasma.nix b/nixos/plasma.nix index 14f22b37..8858d1c4 100644 --- a/nixos/plasma.nix +++ b/nixos/plasma.nix @@ -1,7 +1,7 @@ { config, makeEnable, ... }: makeEnable config "modules.plasma" true { + services.displayManager.sddm.enable = true; services.xserver = { desktopManager.plasma5.enable = true; - displayManager.sddm.enable = true; }; }