From 5ef24c2a434a4a46939f1f81968a772637827daf Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 22 Apr 2024 17:15:05 -0500 Subject: [PATCH] Update the system --- flake.lock | 102 +++++++++++++++++++++--------------------- home/modules/gui.nix | 2 +- modules/nixos/kde.nix | 16 +++---- overlays/default.nix | 9 ++-- 4 files changed, 63 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 67c2120..e9da980 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1712079060, + "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1705915768, - "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=", + "lastModified": 1713543876, + "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b", + "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", "type": "github" }, "original": { @@ -87,11 +87,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -105,11 +105,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -123,11 +123,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1705659542, - "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", + "lastModified": 1712386041, + "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", + "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff", "type": "github" }, "original": { @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1706798041, - "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", + "lastModified": 1713818326, + "narHash": "sha256-aw3xbVPJauLk/bbrlakIYxKpeuMWzA2feGrkIpIuXd8=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", + "rev": "67de98ae6eed5ad6f91b1142356d71a87ba97f21", "type": "github" }, "original": { @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1705535278, - "narHash": "sha256-V5+XKfNbiY0bLKLQlH+AXyhHttEL7XcZBH9iSbxxexA=", + "lastModified": 1711133180, + "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "b84191db127c16a92cbdf7f7b9969d58bb456699", + "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nix23_05": { "locked": { - "lastModified": 1702759837, - "narHash": "sha256-u3XeJVRe/Q975nwFE+6ALEwypMKJEELMJKDAhSKyq3M=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2566f4f897ac6224e094b167d9488d03e157f28", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { @@ -305,11 +305,11 @@ "nmt": "nmt" }, "locked": { - "lastModified": 1705702328, - "narHash": "sha256-yDPcAUzGlQ4e7JKHVligTUpXcB2X18QNOrA5pzmeus0=", + "lastModified": 1712087457, + "narHash": "sha256-gY+sitxzfFSKXaY0oDjhOSobvnMeAbH+A2cDQ9sh2/8=", "owner": "NixNeovim", "repo": "NixNeovim", - "rev": "30e3b1854039a16d8fd08a1ed3f5aaf6c114060e", + "rev": "333583b60d3f289457e1f0654248d5c8faf47889", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1705344848, - "narHash": "sha256-Ns//Yrqug/OmupDUS4ue1tTvv4/UmLtY9oI6dIeWcMM=", + "lastModified": 1712087376, + "narHash": "sha256-HLgP3fgCzcFbw6BO3w/qBRRx0BH3c9dXqP/dhnnaMww=", "owner": "nixneovim", "repo": "nixneovimplugins", - "rev": "1054b77f33b54727082fb17170ce91d121b8a496", + "rev": "58d76e27b9cc686b8ae6ed26be985b1b9868c790", "type": "github" }, "original": { @@ -361,11 +361,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1705496572, - "narHash": "sha256-rPIe9G5EBLXdBdn9ilGc0nq082lzQd0xGGe092R/5QE=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "842d9d80cfd4560648c785f8a4e6f3b096790e19", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -377,11 +377,11 @@ }, "nixstable": { "locked": { - "lastModified": 1708831307, - "narHash": "sha256-0iL/DuGjiUeck1zEaL+aIe2WvA3/cVhp/SlmTcOZXH4=", + "lastModified": 1713725259, + "narHash": "sha256-9ZR/Rbx5/Z/JZf5ehVNMoz/s5xjpP0a22tL6qNvLt5E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5bf1cadb72ab4e77cb0b700dab76bcdaf88f706b", + "rev": "a5e4bbcb4780c63c79c87d29ea409abf097de3f7", "type": "github" }, "original": { @@ -393,11 +393,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -427,11 +427,11 @@ "nmt": { "flake": false, "locked": { - "lastModified": 1694274695, - "narHash": "sha256-PufoLMSuBYkga8hTqYf/cIQzSuy2lfFj+cdKcp2nLEI=", + "lastModified": 1709382952, + "narHash": "sha256-n/BvuWVcQxaXCU30feNRqWWqabhIIO2+tRFnhLIhjiQ=", "owner": "jooooscha", "repo": "nmt", - "rev": "29595267923b4a6ce766ff0d85afaa930842b88d", + "rev": "86a09994d1007c39a1f4d386e3caea9b4681d9d6", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nurpkgs": { "locked": { - "lastModified": 1706910257, - "narHash": "sha256-w0EN3LJS+4HlkTBb3rgImSWCkzNdFWxsIbgsYpKh09E=", + "lastModified": 1713815481, + "narHash": "sha256-WyJ2WR9GCkw3cNCTp7Xe/nbeAINPLqmlEQYBVzwnq54=", "owner": "nix-community", "repo": "NUR", - "rev": "96b0e9d38890afb8e4af6d6a556ee27e79fd6e22", + "rev": "28a705279a74e75b4f8beeba08efc22606346585", "type": "github" }, "original": { @@ -567,11 +567,11 @@ ] }, "locked": { - "lastModified": 1709211223, - "narHash": "sha256-1cjd+yXbTlnCwNwEDjn289rJ2f0er5M8pOig4PxniEM=", + "lastModified": 1713528946, + "narHash": "sha256-IBQta+xrEaI2S5UmYrXcgV7Tu7rGLQu2V3TeJseLPSg=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "3257ad7f173b0314c8a42fec450fa6556495b97c", + "rev": "63c1247e12f269396ed2df8cdec3aed1f0f3928c", "type": "github" }, "original": { diff --git a/home/modules/gui.nix b/home/modules/gui.nix index ca87db7..486165e 100644 --- a/home/modules/gui.nix +++ b/home/modules/gui.nix @@ -69,7 +69,7 @@ in { }; extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden - bypass-paywalls-clean + #bypass-paywalls-clean gsconnect foxyproxy-standard multi-account-containers diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix index 050f09e..685edb8 100644 --- a/modules/nixos/kde.nix +++ b/modules/nixos/kde.nix @@ -13,16 +13,10 @@ in with lib; { services = { xserver = { enable = true; - displayManager = { - defaultSession = "plasma"; - sddm.enable = true; - }; xkb.layout = "us"; # Trackpad support libinput.enable = true; - } // (optionalAttrs (builtins.hasAttr "plasma6" options.services.xserver.desktopManager) { - desktopManager.plasma6.enable = true; - }); + }; pipewire = { enable = true; @@ -30,7 +24,13 @@ in with lib; { alsa.support32Bit = true; pulse.enable = true; }; - }; + } // (optionalAttrs (builtins.hasAttr "plasma6" options.services.xserver.desktopManager) { + desktopManager.plasma6.enable = true; + displayManager = { + defaultSession = "plasma"; + sddm.enable = true; + }; + }); programs.dconf.enable = true; programs.sway.enable = true; # Gives us Wayland diff --git a/overlays/default.nix b/overlays/default.nix index 648d8cf..2d9c0a6 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -87,14 +87,11 @@ in rec { }; pipenv-ivr = prev.callPackage ./pipenv.nix { }; - xonsh = prev.xonsh.overridePythonAttrs (old: rec{ - python3 = final.gregpy; - propagatedBuildInputs = with final.gregpy.pkgs; old.propagatedBuildInputs ++ [ - responses - ruamel-yaml + xonsh = (prev.xonsh.override { + extraPackages = (ps: with ps; [ xonsh-apipenv xonsh-direnv xontrib-vox - ]; + ]); }); }