diff --git a/flake.lock b/flake.lock index 412ef81..5cf04d6 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1703043529, - "narHash": "sha256-3OCMEA/RPwgdzFfQGXRQyvHlWYKY0tTbrlR5ETBzEYI=", + "lastModified": 1703450140, + "narHash": "sha256-ZNNcuLJAjJbkRlU/53KKOgs1xI+y/LXWBdBukbm3hxY=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "56c1ef38d3e04eae9b5867669ed131601fa99a7d", + "rev": "9f81761270e6343d00b99d3e07e1feee8f3ba4b5", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1703415240, + "narHash": "sha256-SgsAYwDo2wWHUdZeNKKRRT402sRzQ/rLmzxH/wqMUPw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "f454cff5fe84adca9e8aa8d546d2c9879b789950", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1702939079, - "narHash": "sha256-IwGKfFgCxWgrioWgb27Ivc+4mQWslVbOV50SOTzwE8A=", + "lastModified": 1703515744, + "narHash": "sha256-x/Oz43zeFewMyDglI4AGfyv7xgJZCL75/RL+kGwahto=", "owner": "rycee", "repo": "nur-expressions", - "rev": "efea9b4fe83dcccf58bb791073639cdff0c9598c", + "rev": "3776272394cb8b1caf3db29bc6dc853f11208b46", "type": "gitlab" }, "original": { @@ -108,6 +108,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1629284811, @@ -145,6 +161,24 @@ "inputs": { "systems": "systems_2" }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -160,6 +194,28 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "kde2nix", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -188,11 +244,11 @@ ] }, "locked": { - "lastModified": 1703072477, - "narHash": "sha256-I2g7o+J26iK3sGk53iuaYiMWryzAYx0zhNQUFzTID/A=", + "lastModified": 1703527373, + "narHash": "sha256-AjypRssRtS6F3xkf7rE3/bXkIF2WJOZLbTIspjcE1zM=", "owner": "nix-community", "repo": "home-manager", - "rev": "433120e47d016c9960dd9c2b1821e97d223a6a39", + "rev": "80679ea5074ab7190c4cce478c600057cfb5edae", "type": "github" }, "original": { @@ -201,6 +257,26 @@ "type": "github" } }, + "kde2nix": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1703361984, + "narHash": "sha256-3pZJY6h2OsmLi9iA6vHLYrlOcv3OK4ZCX9ljw66Q5xc=", + "owner": "nix-community", + "repo": "kde2nix", + "rev": "cc627fe32d9283205592574208ae4fcdf93d3414", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "kde2nix", + "type": "github" + } + }, "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", @@ -238,7 +314,7 @@ "nixos-generators": { "inputs": { "nixlib": "nixlib", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1701689616, @@ -256,17 +332,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702830618, - "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" } }, @@ -287,11 +363,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1702921762, - "narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=", + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1703200384, + "narHash": "sha256-q5j06XOsy0qHOarsYPfZYJPWbTbc8sryRxianlEPJN0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d02ffbbe834b5599fc5f134e644e49397eb07188", + "rev": "0b3d618173114c64ab666f557504d6982665d328", "type": "github" }, "original": { @@ -301,7 +393,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -317,13 +409,13 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_4": { "locked": { - "lastModified": 1702777222, - "narHash": "sha256-/SYmqgxTYzqZnQEfbOCHCN4GzqB9uAIsR9IWLzo0/8I=", + "lastModified": 1703351344, + "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a19a71d1ee93226fd71984359552affbc1cd3dc3", + "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", "type": "github" }, "original": { @@ -333,7 +425,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_5": { "locked": { "lastModified": 1692492726, "narHash": "sha256-rld5qm2B4oRkDwcPD+yOSyTrZQdfCR6mzJGGkecjvTs=", @@ -351,11 +443,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { @@ -382,6 +474,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1702319469, + "narHash": "sha256-vxXgbGOmGLr5JUbFZUM/TVYYn/quMTqfFJrx5EXyhbk=", + "owner": "K900", + "repo": "nixpkgs", + "rev": "80878a189a3a7dd9c7253370e2771596936b8a74", + "type": "github" + }, + "original": { + "owner": "K900", + "ref": "qt6ening", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1693714546, "narHash": "sha256-3EMJZeGSZT6pD1eNwI/6Yc0R4rxklNvJ2SDFcsCnjpM=", @@ -397,13 +505,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1703255338, + "narHash": "sha256-Z6wfYJQKmDN9xciTwU3cOiOk+NElxdZwy/FiHctCzjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "6df37dc6a77654682fe9f071c62b4242b5342e04", "type": "github" }, "original": { @@ -413,13 +521,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1703134684, + "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "d6863cbcbbb80e71cecfc03356db1cda38919523", "type": "github" }, "original": { @@ -429,7 +537,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1692463654, "narHash": "sha256-F8hZmsQINI+S6UROM4jyxAMbQLtzE44pI8Nk6NtMdao=", @@ -447,18 +555,18 @@ }, "nixvim": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs-unstable" ], - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { - "lastModified": 1703087450, - "narHash": "sha256-wmsdHlhT7M53NEVYSeTpq35/xKMv5kSGTkfh3XtTPhQ=", + "lastModified": 1703435563, + "narHash": "sha256-BDnoVc9Kvc9wo9lt8GC0kkqwLedP7lnBBdh1UHl4cPw=", "owner": "nix-community", "repo": "nixvim", - "rev": "2463b522504d55a95b9f2050d4cb24791679b4b6", + "rev": "c11158c73e9a488d803356127a54af8101fc0051", "type": "github" }, "original": { @@ -469,11 +577,11 @@ }, "nur": { "locked": { - "lastModified": 1703090758, - "narHash": "sha256-gYoLxlB+w+N+G4bLeu76MYSoBCZgC00of4kM4dIDI3o=", + "lastModified": 1703634709, + "narHash": "sha256-MBzASzznDbUOcBUme32dks8V7gnjdoOEzhAX0L2h/Qc=", "owner": "nix-community", "repo": "nur", - "rev": "f133fc54e2a2495d19f6020120717240068ce0f3", + "rev": "a17e7841c4d587aa3cb579b0fc156055b3dad82f", "type": "github" }, "original": { @@ -485,13 +593,41 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": [ + "kde2nix", + "flake-utils" + ], "gitignore": "gitignore", + "nixpkgs": [ + "kde2nix", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1702290759, + "narHash": "sha256-DUPtcei6GJlrC05Y3cqwLLSst+sp07334aAZw4Uk118=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "f99ed8523fc3aef67a7c838ca31f4b94ef902837", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-hooks_2": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_4", + "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1702456155, @@ -513,10 +649,11 @@ "darwin": "darwin", "firefox-addons": "firefox-addons", "home-manager": "home-manager", + "kde2nix": "kde2nix", "nix-colors": "nix-colors", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs": "nixpkgs_5", + "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "nur": "nur", @@ -542,15 +679,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs": "nixpkgs_6", + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1702937567, - "narHash": "sha256-bUNl3GPqRgTGp13+oV1DrYa1/NHuGHo5SKmr+RqC/2g=", + "lastModified": 1703387502, + "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f7db64b88dabc95e4f7bee20455f418e7ab805d4", + "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3", "type": "github" }, "original": { @@ -561,8 +698,8 @@ }, "sops-nix-darwin": { "inputs": { - "nixpkgs": "nixpkgs_6", - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs": "nixpkgs_7", + "nixpkgs-stable": "nixpkgs-stable_5" }, "locked": { "lastModified": 1692658736, @@ -608,6 +745,21 @@ "repo": "default", "type": "github" } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b242ed0..9ff9fec 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; apple-silicon.url = "github:tpwrules/nixos-apple-silicon"; + + # KDE Plasma 6+ + kde2nix.url = "github:nix-community/kde2nix"; # Secrets sops-nix.url = "github:Mic92/sops-nix"; @@ -37,6 +40,18 @@ nixos-generators.url = "github:nix-community/nixos-generators"; }; + nixConfig = { + extra-substituters = [ + "https://nix-community.cachix.org" + "https://0uptime.cachix.org" + ]; + + extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "0uptime.cachix.org-1:ctw8yknBLg9cZBdqss+5krAem0sHYdISkw/IFdRbYdE=" + ]; + }; + outputs = { self, nixpkgs, home-manager, ... }@inputs: let inherit (self) outputs; @@ -119,6 +134,9 @@ # Keylime Lab keylime = mkNixos [ ./nixos/hosts/keylime ]; + + # HP Spectre + drone = mkNixos [ ./nixos/hosts/drone ]; }; darwinConfigurations = { diff --git a/home-manager/features/fish.nix b/home-manager/features/fish.nix index bf787db..b558462 100644 --- a/home-manager/features/fish.nix +++ b/home-manager/features/fish.nix @@ -19,7 +19,7 @@ vim = "nvim"; vi = "nvim"; vimin = "NVIM_APPNAME=nvim-minimal nvim"; - ddgo = "${pkgs.w3m} https://lite.duckduckgo.com"; + nano = "nvim"; }; }; diff --git a/home-manager/noe/hosts/drone.nix b/home-manager/noe/hosts/drone.nix new file mode 100644 index 0000000..ba1e28c --- /dev/null +++ b/home-manager/noe/hosts/drone.nix @@ -0,0 +1,9 @@ +{ ... }: { + imports = [ + ../common + ../common/home-user.nix + + ../../features/kitty.nix + ../../features/vesktop + ]; +} diff --git a/nixos/base.nix b/nixos/base.nix index 373e60e..d41cfa5 100644 --- a/nixos/base.nix +++ b/nixos/base.nix @@ -64,6 +64,7 @@ settings = { experimental-features = "nix-command flakes"; #auto-optimize-store = true; + trusted-users = [ "root" "@wheel" ]; }; }; diff --git a/nixos/features/kde.nix b/nixos/features/kde.nix index 15a06ac..8739587 100644 --- a/nixos/features/kde.nix +++ b/nixos/features/kde.nix @@ -1,11 +1,19 @@ -{ pkgs, ... }: { +{ pkgs, inputs, ... }: { + #imports = [ + # inputs.kde2nix.nixosModules.plasma6 + #]; + services.xserver = { + enable = true; displayManager.sddm = { enable = true; wayland.enable = true; }; - desktopManager.plasma5.enable = true; + desktopManager.plasma5 = { + enable = true; + }; }; + programs.xwayland.enable = true; }