diff --git a/.nvidia-settings-rc b/.nvidia-settings-rc deleted file mode 100644 index 9b3da83..0000000 --- a/.nvidia-settings-rc +++ /dev/null @@ -1,20 +0,0 @@ -# -# /home/bolt/.nvidia-settings-rc -# -# Configuration file for nvidia-settings - the NVIDIA Settings utility -# Generated on Sat Jan 7 20:25:59 2023 -# - -# ConfigProperties: - -RcFileLocale = C -DisplayStatusBar = Yes -SliderTextEntries = Yes -IncludeDisplayNameInConfigFile = No -UpdateRulesOnProfileNameChange = Yes -Timer = PowerMizer_Monitor_(GPU_0),Yes,1000 -Timer = Thermal_Monitor_(GPU_0),Yes,1000 -Timer = Memory_Used_(GPU_0),Yes,3000 - -# Attributes: - diff --git a/kdekeys b/.old/kdekeys similarity index 100% rename from kdekeys rename to .old/kdekeys diff --git a/op.pal b/.old/op.pal similarity index 100% rename from op.pal rename to .old/op.pal diff --git a/pkgs/bismuth.nix b/.old/pkgs/bismuth.nix similarity index 100% rename from pkgs/bismuth.nix rename to .old/pkgs/bismuth.nix diff --git a/pkgs/coconut.nix b/.old/pkgs/coconut.nix similarity index 100% rename from pkgs/coconut.nix rename to .old/pkgs/coconut.nix diff --git a/pkgs/culr.nix b/.old/pkgs/culr.nix similarity index 100% rename from pkgs/culr.nix rename to .old/pkgs/culr.nix diff --git a/pkgs/default.nix b/.old/pkgs/default.nix similarity index 100% rename from pkgs/default.nix rename to .old/pkgs/default.nix diff --git a/pkgs/everforst-theme.nix b/.old/pkgs/everforst-theme.nix similarity index 100% rename from pkgs/everforst-theme.nix rename to .old/pkgs/everforst-theme.nix diff --git a/pkgs/eww.nix b/.old/pkgs/eww.nix similarity index 100% rename from pkgs/eww.nix rename to .old/pkgs/eww.nix diff --git a/pkgs/git-credential-keepassxc.nix b/.old/pkgs/git-credential-keepassxc.nix similarity index 100% rename from pkgs/git-credential-keepassxc.nix rename to .old/pkgs/git-credential-keepassxc.nix diff --git a/pkgs/glpaper.nix b/.old/pkgs/glpaper.nix similarity index 100% rename from pkgs/glpaper.nix rename to .old/pkgs/glpaper.nix diff --git a/pkgs/gruvbox-gtk-theme.nix b/.old/pkgs/gruvbox-gtk-theme.nix similarity index 100% rename from pkgs/gruvbox-gtk-theme.nix rename to .old/pkgs/gruvbox-gtk-theme.nix diff --git a/pkgs/gruvbox-kvantum.nix b/.old/pkgs/gruvbox-kvantum.nix similarity index 100% rename from pkgs/gruvbox-kvantum.nix rename to .old/pkgs/gruvbox-kvantum.nix diff --git a/pkgs/headscale-ui.nix b/.old/pkgs/headscale-ui.nix similarity index 100% rename from pkgs/headscale-ui.nix rename to .old/pkgs/headscale-ui.nix diff --git a/pkgs/hyprland-system76-scheduler-hook.sh b/.old/pkgs/hyprland-system76-scheduler-hook.sh similarity index 100% rename from pkgs/hyprland-system76-scheduler-hook.sh rename to .old/pkgs/hyprland-system76-scheduler-hook.sh diff --git a/pkgs/hyprland-system76-scheduler-integration.nix b/.old/pkgs/hyprland-system76-scheduler-integration.nix similarity index 100% rename from pkgs/hyprland-system76-scheduler-integration.nix rename to .old/pkgs/hyprland-system76-scheduler-integration.nix diff --git a/pkgs/kanagawa-icons.nix b/.old/pkgs/kanagawa-icons.nix similarity index 100% rename from pkgs/kanagawa-icons.nix rename to .old/pkgs/kanagawa-icons.nix diff --git a/pkgs/kanagawa-theme.nix b/.old/pkgs/kanagawa-theme.nix similarity index 100% rename from pkgs/kanagawa-theme.nix rename to .old/pkgs/kanagawa-theme.nix diff --git a/pkgs/kwin-system76-scheduler-integration.nix b/.old/pkgs/kwin-system76-scheduler-integration.nix similarity index 100% rename from pkgs/kwin-system76-scheduler-integration.nix rename to .old/pkgs/kwin-system76-scheduler-integration.nix diff --git a/pkgs/lemurs.nix b/.old/pkgs/lemurs.nix similarity index 100% rename from pkgs/lemurs.nix rename to .old/pkgs/lemurs.nix diff --git a/pkgs/ly.nix b/.old/pkgs/ly.nix similarity index 100% rename from pkgs/ly.nix rename to .old/pkgs/ly.nix diff --git a/pkgs/pygments.nix b/.old/pkgs/pygments.nix similarity index 100% rename from pkgs/pygments.nix rename to .old/pkgs/pygments.nix diff --git a/pkgs/rose-pine-icons.nix b/.old/pkgs/rose-pine-icons.nix similarity index 100% rename from pkgs/rose-pine-icons.nix rename to .old/pkgs/rose-pine-icons.nix diff --git a/pkgs/rose-pine-theme.nix b/.old/pkgs/rose-pine-theme.nix similarity index 100% rename from pkgs/rose-pine-theme.nix rename to .old/pkgs/rose-pine-theme.nix diff --git a/pkgs/simplewaita-gtk.nix b/.old/pkgs/simplewaita-gtk.nix similarity index 100% rename from pkgs/simplewaita-gtk.nix rename to .old/pkgs/simplewaita-gtk.nix diff --git a/sway-nvidia.patch b/.old/sway-nvidia.patch similarity index 100% rename from sway-nvidia.patch rename to .old/sway-nvidia.patch diff --git a/top n bottom.layout.latte b/.old/top n bottom.layout.latte similarity index 100% rename from top n bottom.layout.latte rename to .old/top n bottom.layout.latte diff --git a/wollomi-xorg.conf b/.old/wollomi-xorg.conf similarity index 100% rename from wollomi-xorg.conf rename to .old/wollomi-xorg.conf diff --git a/TODO b/TODO deleted file mode 100644 index 0203142..0000000 --- a/TODO +++ /dev/null @@ -1,2 +0,0 @@ -change helix theme: -switch some of the colouring around to feel more appropriate \ No newline at end of file diff --git a/flake.lock b/flake.lock index 7b94b6e..5d0f7aa 100644 --- a/flake.lock +++ b/flake.lock @@ -1,46 +1,5 @@ { "nodes": { - "alejandra": { - "inputs": { - "fenix": "fenix", - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "persway", - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658427149, - "narHash": "sha256-ToD/1z/q5VHsLMrS2h96vjJoLho59eNRtknOUd19ey8=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "f5a22afd2adfb249b4e68e0b33aa1f0fb73fb1be", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "repo": "alejandra", - "type": "github" - } - }, - "all-cabal-json": { - "flake": false, - "locked": { - "lastModified": 1665552503, - "narHash": "sha256-r14RmRSwzv5c+bWKUDaze6pXM7nOsiz1H8nvFHJvufc=", - "owner": "nix-community", - "repo": "all-cabal-json", - "rev": "d7c0434eebffb305071404edcf9d5cd99703878e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "hackage", - "repo": "all-cabal-json", - "type": "github" - } - }, "crane": { "inputs": { "flake-compat": "flake-compat", @@ -71,164 +30,6 @@ "type": "github" } }, - "crane_2": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "ironbar", - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1693439040, - "narHash": "sha256-t2nOxBcP0Q/XJt6Ild4v0hJ49OSl9F3nE1cdIT4xsDg=", - "owner": "ipetkov", - "repo": "crane", - "rev": "174604795d316b75777e28185c3a4918bc69b399", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_3": { - "flake": false, - "locked": { - "lastModified": 1670900067, - "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", - "owner": "ipetkov", - "repo": "crane", - "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "devshell": { - "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": [ - "persway", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1677856503, - "narHash": "sha256-TW8my47VpavO/PXA5hIumUcX80cj0AufojjUTdUonLw=", - "owner": "numtide", - "repo": "devshell", - "rev": "643d1857fea4e71e7f251cb574f59b1d63778085", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_2": { - "flake": false, - "locked": { - "lastModified": 1663445644, - "narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=", - "owner": "numtide", - "repo": "devshell", - "rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "dream2nix": { - "inputs": { - "alejandra": "alejandra", - "all-cabal-json": "all-cabal-json", - "crane": "crane_3", - "devshell": "devshell_2", - "flake-parts": "flake-parts_2", - "flake-utils-pre-commit": "flake-utils-pre-commit", - "ghc-utils": "ghc-utils", - "gomod2nix": "gomod2nix", - "mach-nix": "mach-nix", - "nix-pypi-fetcher": "nix-pypi-fetcher", - "nixpkgs": [ - "persway", - "nixpkgs" - ], - "poetry2nix": "poetry2nix", - "pre-commit-hooks": "pre-commit-hooks_2", - "pruned-racket-catalog": "pruned-racket-catalog" - }, - "locked": { - "lastModified": 1677289985, - "narHash": "sha256-lUp06cTTlWubeBGMZqPl9jODM99LpWMcwxRiscFAUJg=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "28b973a8d4c30cc1cbb3377ea2023a76bc3fb889", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, - "fenix": { - "inputs": { - "nixpkgs": [ - "persway", - "dream2nix", - "alejandra", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", - "owner": "nix-community", - "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "persway", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1678256692, - "narHash": "sha256-c7yiGJjDGmnBl1urFTTeTTrBeOIHpRiF4gIxTLiD21Y=", - "owner": "nix-community", - "repo": "fenix", - "rev": "6f8e764f0f9af84e98c53b8dc2feffb7f7d6d103", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -277,22 +78,6 @@ "type": "github" } }, - "flake-compat_4": { - "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-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" @@ -312,28 +97,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "persway", - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_3" }, @@ -351,7 +114,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_4" }, @@ -387,21 +150,6 @@ "type": "github" } }, - "flake-utils-pre-commit": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flake-utils_2": { "inputs": { "systems": "systems_2" @@ -424,24 +172,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1681202837, "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", @@ -456,53 +186,6 @@ "type": "github" } }, - "flake-utils_5": { - "locked": { - "lastModified": 1642700792, - "narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "846b2ae0fc4cc943637d3d1def4454213e203cba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "ghc-utils": { - "flake": false, - "locked": { - "lastModified": 1662774800, - "narHash": "sha256-1Rd2eohGUw/s1tfvkepeYpg8kCEXiIot0RijapUjAkE=", - "ref": "refs/heads/master", - "rev": "bb3a2d3dc52ff0253fb9c2812bd7aa2da03e0fea", - "revCount": 1072, - "type": "git", - "url": "https://gitlab.haskell.org/bgamari/ghc-utils" - }, - "original": { - "type": "git", - "url": "https://gitlab.haskell.org/bgamari/ghc-utils" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -525,22 +208,6 @@ "type": "github" } }, - "gomod2nix": { - "flake": false, - "locked": { - "lastModified": 1627572165, - "narHash": "sha256-MFpwnkvQpauj799b4QTBJQFEddbD02+Ln5k92QyHOSk=", - "owner": "tweag", - "repo": "gomod2nix", - "rev": "67f22dd738d092c6ba88e420350ada0ed4992ae8", - "type": "github" - }, - "original": { - "owner": "tweag", - "repo": "gomod2nix", - "type": "github" - } - }, "helix": { "inputs": { "crane": "crane", @@ -584,31 +251,6 @@ "type": "github" } }, - "ironbar": { - "inputs": { - "crane": "crane_2", - "naersk": "naersk", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1695668783, - "narHash": "sha256-pXVei5KZMxALQ8ibx0oqbfh5N/FI3VzJHodDNAh41xE=", - "owner": "JakeStanger", - "repo": "ironbar", - "rev": "0c0163cfa1a8c0286edf231507026dd6f5798644", - "type": "github" - }, - "original": { - "owner": "JakeStanger", - "repo": "ironbar", - "type": "github" - } - }, "kitty-themes-src": { "flake": false, "locked": { @@ -625,39 +267,6 @@ "type": "github" } }, - "mach-nix": { - "flake": false, - "locked": { - "lastModified": 1634711045, - "narHash": "sha256-m5A2Ty88NChLyFhXucECj6+AuiMZPHXNbw+9Kcs7F6Y=", - "owner": "DavHau", - "repo": "mach-nix", - "rev": "4433f74a97b94b596fa6cd9b9c0402104aceef5d", - "type": "github" - }, - "original": { - "id": "mach-nix", - "type": "indirect" - } - }, - "naersk": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1692351612, - "narHash": "sha256-KTGonidcdaLadRnv9KFgwSMh1ZbXoR/OBmPjeNMhFwU=", - "owner": "nix-community", - "repo": "naersk", - "rev": "78789c30d64dea2396c9da516bbcc8db3a475207", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -678,26 +287,10 @@ "type": "github" } }, - "nix-pypi-fetcher": { - "flake": false, - "locked": { - "lastModified": 1669065297, - "narHash": "sha256-UStjXjNIuIm7SzMOWvuYWIHBkPUKQ8Id63BMJjnIDoA=", - "owner": "DavHau", - "repo": "nix-pypi-fetcher", - "rev": "a9885ac6a091576b5195d547ac743d45a2a615ac", - "type": "github" - }, - "original": { - "owner": "DavHau", - "repo": "nix-pypi-fetcher", - "type": "github" - } - }, "nix-rice": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_4", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", "kitty-themes-src": "kitty-themes-src", "nixpkgs-lib": "nixpkgs-lib", "pre-commit-hooks": "pre-commit-hooks" @@ -734,7 +327,7 @@ "nixd": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1695137077, @@ -752,16 +345,18 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693355128, - "narHash": "sha256-+ZoAny3ZxLcfMaUoLVgL9Ywb/57wP+EtsdNGuXUJrwg=", + "lastModified": 1681303793, + "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a63a64b593dcf2fe05f7c5d666eb395950f36bc9", + "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-lib": { @@ -866,22 +461,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1681303793, - "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1686398752, "narHash": "sha256-nGWNQVhSw4VSL+S0D0cbrNR9vs9Bq7rlYR+1K5f5j6w=", @@ -897,7 +476,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1695360818, "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=", @@ -913,7 +492,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1695644571, "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", @@ -944,58 +523,15 @@ "type": "github" } }, - "persway": { - "inputs": { - "devshell": "devshell", - "dream2nix": "dream2nix", - "fenix": "fenix_2", - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688297250, - "narHash": "sha256-+gnAY9xBvs+1h6G3dzcImztsQpQs9zcXTBZCs6vdkG0=", - "owner": "johnae", - "repo": "persway", - "rev": "24e02124c4f0b7be933e768a11a14e510a389bf5", - "type": "github" - }, - "original": { - "owner": "johnae", - "repo": "persway", - "type": "github" - } - }, - "poetry2nix": { - "flake": false, - "locked": { - "lastModified": 1666918719, - "narHash": "sha256-BkK42fjAku+2WgCOv2/1NrPa754eQPV7gPBmoKQBWlc=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "289efb187123656a116b915206e66852f038720e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "1.36.0", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": [ "nix-rice", "flake-utils" ], "gitignore": "gitignore", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -1012,54 +548,10 @@ "type": "github" } }, - "pre-commit-hooks_2": { - "inputs": { - "flake-utils": [ - "persway", - "dream2nix", - "flake-utils-pre-commit" - ], - "nixpkgs": [ - "persway", - "dream2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1646153636, - "narHash": "sha256-AlWHMzK+xJ1mG267FdT8dCq/HvLCA6jwmx2ZUy5O8tY=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "b6bc0b21e1617e2b07d8205e7fae7224036dfa4b", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "pruned-racket-catalog": { - "flake": false, - "locked": { - "lastModified": 1672537287, - "narHash": "sha256-SuOvXVcLfakw18oJB/PuRMyvGyGG1+CQD3R+TGHIv44=", - "owner": "nix-community", - "repo": "pruned-racket-catalog", - "rev": "c8b89557fb53b36efa2ee48a769c7364df0f6262", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "catalog", - "repo": "pruned-racket-catalog", - "type": "github" - } - }, "pywlroots": { "inputs": { - "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_5", + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_4", "pywlroots-src": "pywlroots-src" }, "locked": { @@ -1091,7 +583,7 @@ }, "qtile": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" ], @@ -1130,51 +622,15 @@ "flake-utils": "flake-utils", "helix": "helix", "home-manager": "home-manager", - "ironbar": "ironbar", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", "nix-std": "nix-std", "nixd": "nixd", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable_2", "nur": "nur", - "persway": "persway", "qtile": "qtile", - "rust-overlay": "rust-overlay_3" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_2": { - "flake": false, - "locked": { - "lastModified": 1678199120, - "narHash": "sha256-G8z2A1NvywTOATMTvx+FPxMf4PC91p0Z7fONx5PYW+4=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "ecc32c2f8517576b26060915bcb0cdb00cafd060", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" + "rust-overlay": "rust-overlay_2" } }, "rust-overlay": { @@ -1203,33 +659,6 @@ } }, "rust-overlay_2": { - "inputs": { - "flake-utils": [ - "ironbar", - "crane", - "flake-utils" - ], - "nixpkgs": [ - "ironbar", - "crane", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1691374719, - "narHash": "sha256-HCodqnx1Mi2vN4f3hjRPc7+lSQy18vRn8xWW68GeQOg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "b520a3889b24aaf909e287d19d406862ced9ffc9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { "inputs": { "flake-utils": [ "flake-utils" @@ -1296,21 +725,6 @@ "repo": "default", "type": "github" } - }, - "systems_4": { - "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 ec5749a..bd52c6a 100644 --- a/flake.nix +++ b/flake.nix @@ -9,18 +9,6 @@ nix-std.url = "github:chessai/nix-std"; - ironbar = { - url = "github:JakeStanger/ironbar"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.rust-overlay.follows = "rust-overlay"; - }; - - persway = { - url = "github:johnae/persway"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; @@ -63,8 +51,6 @@ nixpkgs-stable, home-manager, nur, - ironbar, - persway, helix, qtile, nixd, @@ -78,7 +64,7 @@ "x86_64-linux" ]; in rec { - overlays = import ./overlay.nix {inherit inputs;}; + overlays = import ./util/overlay.nix {inherit inputs;}; nixosConfigurations = { "quiver" = nixpkgs.lib.nixosSystem { diff --git a/home/overlay.nix b/home/overlay.nix deleted file mode 100644 index c734e09..0000000 --- a/home/overlay.nix +++ /dev/null @@ -1,8 +0,0 @@ -inputs: _: prev: { - wlogout_style_base = dots/wlogout/style.css; - wlogout_style = prev.runCommandLocal "wlogout_style_base" {wlogpath = lib.strings.escape ["/"] "${pkgs.wlogout}";} '' - cp ${wlogout_style_base} $out - sed -i "s/\/usr\/share\/wlogout/$wlogpath\/share\/wlogout/g" $out - sed -i "s/\/etc\/wlogout/$wlogpath\/etc\/wlogout/g" $out - ''; -} diff --git a/overlay.nix b/overlay.nix deleted file mode 100644 index 22acd69..0000000 --- a/overlay.nix +++ /dev/null @@ -1,47 +0,0 @@ -{inputs, ...}: { - additions = final: _prev: import ./pkgs {pkgs = final;}; - pkg-sets = final: prev: { - unstable = import inputs.nixpkgs { - system = final.system; - config.allowUnfree = true; - }; - stable = import inputs.nixpkgs-stable { - system = final.system; - config.allowUnfree = true; - }; - }; - - rice = import ./rice.nix; - - wlroots = final: prev: { - wlroots = final.unstable.wlroots.overrideAttrs (wfinal: wprev: { - postPatch = - wprev.postPatch - + '' - substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();" - ''; - }); - }; - - sway-unwrapped = final: prev: { - sway-unwrapped = - (final.unstable.sway-unwrapped.override { - wlroots = final.wlroots; - systemdSupport = true; - trayEnabled = true; - }) - .overrideAttrs ( - sfinal: sprev: { - patches = (sprev.patches or []) ++ [./sway-nvidia.patch]; - } - ); - }; - - sway = final: prev: { - sway = final.unstable.sway.override { - sway-unwrapped = final.sway-unwrapped; - withBaseWrapper = true; - withGtkWrapper = true; - }; - }; -} diff --git a/rhizome-vps b/rhizome-vps deleted file mode 160000 index 6087a24..0000000 --- a/rhizome-vps +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6087a2475d7c374934fde85b94e0939bc51be011 diff --git a/system/configuration.nix b/system/configuration.nix index 941e22d..941c59f 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -13,13 +13,9 @@ inputs.nur.overlay outputs.overlays.additions outputs.overlays.pkg-sets - outputs.overlays.wlroots - outputs.overlays.sway-unwrapped - outputs.overlays.sway inputs.nix-rice.overlays.default outputs.overlays.rice inputs.helix.overlays.default - inputs.persway.overlays.default inputs.nixd.overlays.default # inputs.eww.overlays.default ]; diff --git a/system/overlay.nix b/system/overlay.nix deleted file mode 100644 index 2536d3e..0000000 --- a/system/overlay.nix +++ /dev/null @@ -1,13 +0,0 @@ -{inputs, ...}: { - additions = final: _prev: import ./pkgs {pkgs = final;}; - unstable-pkgs = final: _prev: { - unstable = import inputs.nixpkgs { - system = final.system; - config.allowUnfree = true; - }; - }; -} -# inputs: _: prev: { -# system76-scheduler = prev.callPackage ./syspkgs/system76-scheduler.nix {}; -# } - diff --git a/reflector.nix b/system/servers/atagen-vps/reflector.nix similarity index 100% rename from reflector.nix rename to system/servers/atagen-vps/reflector.nix diff --git a/system/servers/rhizome-vps/configuration.nix b/system/servers/rhizome-vps/configuration.nix new file mode 100644 index 0000000..812d7b2 --- /dev/null +++ b/system/servers/rhizome-vps/configuration.nix @@ -0,0 +1,278 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running `nixos-help`). +{ + config, + pkgs, + lib, + ... +}: { + imports = [ + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.extraOptions = '' + keep-outputs = true + keep-derivations = true + ''; + + environment.pathsToLink = ["/share/zsh"]; + programs.zsh.enable = true; + users.defaultUserShell = pkgs.zsh; + + users.users.felix = { + isSystemUser = true; + group = "www"; + extraGroups = ["docker"]; + }; + + users.users.spore = { + isSystemUser = true; + home = "/home/spore"; + createHome = true; + useDefaultShell = true; + group = "www"; + extraGroups = ["docker"]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL9VRcCnmjCyV7DpCm8ir3+xPTbyMDBJhgSkhpmdFL5d spore@server.rhizome.tf" + ]; + }; + + users.groups.www = { + members = ["acme" "felix" "spore"]; + }; + + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/vda"; # or "nodev" for efi only + + networking.hostName = "filament"; # Define your hostname. + time.timeZone = "Australia/Sydney"; + + i18n.defaultLocale = "en_AU.UTF-8"; + + users.users.rhizome = { + isNormalUser = true; + extraGroups = ["wheel"]; # Enable ‘sudo’ for the user. + openssh.authorizedKeys.keys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDSQC8VgKLzoU5BSynJJuC8BFqAEN8JlSIzsZ2Vg9rfXHM7T4vbWtnxSCSbNw3CEnZCfrdDQTeRum7Uq+gvrcHWd9Aj+rVmubTdud70ybW7T7SlGv3b5TYBhMNbrAz0JIJjLnFMy3/pWids1v6mKW3i7k6Kbq8fSt7jva5Yg5x1jtkUUwvjSZjPg/E/Zl0hAcnx8fWe4foFTcYYsUbfEpp6bxdN2QuVmb17UKnLrMz6JTj88Jd2uYZkeKxGOwk+uwrd0WArY8JIiRi1NcPA3I42aAQfZKxCUY/xmVyRlF+l6K8caD4CZlysms9aXQzBhmPPDIY87AwyRlVK5JsRbaMEBMsffX2xk8DdV+2+9RbztgeXOoYk7WjJX1/+WcxY3RGn8QsUfrGALmrQTRGXgYRbtM/ZJq1m9aP6IvVQeKE1NOpKguXpmokB7JsyKPcWk/PCMVYyXM/qYspc6hRPJgGWiJsayj7myO6X5Ssl9uQnHpNNyrQNY+cx3/boBu2J1sM= bolt@quiver" + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDW/YjnlHiEf2bV0RapVl+jWEtsNYrbXsaJJhXUkAaf61rsTZ2jpda7FmOVGjyJiOkTNYANoT83YhGxvKt3Ukcx5xG0JhcrilEGKfOR43/QLlXetCh4aFed//CXYNQo8obDovx9A8YamzfZWJo0nhshEAt1aDvNGlyPgHZI3r5vYNB6OpMlaSnr873i5hp6S9dxURoF0FjpdZwTWk5DiYUoZCezs6TfG6PzHbSsB88o4AUNZ6O+h1KD0lITSXH/v/M1zG8fkUzfZHFQoZ6VaIMhIVwLmbybvyb630IIfhx6KUoCWzCRlKBjVOGsQ1xZWEnjPgHB6atX5eNc/L8/bdyZOJ4aE2wSdVNMyriYuiyc3t/RwSvcRpfmzaxWUImDpjH3mxCrDymrZIQQTrNuC6o5O3mz3NCZRcFUZmuZXeYphyrzuNgAfsvHKMd8Fu+PdddSPCHkgYEIRuGD4flaujM8eUHZYqKkpmmiMwKk6jupBscN+1uwBqGQbaR0InXR+4c= custard" + ]; + }; + + users.users.ci = { + isSystemUser = true; + createHome = true; + group = "ci"; + extraGroups = ["docker"]; + }; + + users.users.ci-agent = { + isSystemUser = true; + createHome = true; + group = "ci"; + extraGroups = ["docker"]; + }; + + users.groups.ci = {}; + + virtualisation = { + docker.enable = true; + # podman = { + # enable = true; + # dockerCompat = true; + # defaultNetwork.settings.dns_enabled = true; + # }; + }; + + services.fail2ban.enable = true; + + services.redis.servers."".enable = true; + + services.gitea = { + enable = true; + appName = "rhizome gitea"; + domain = "git.rhizome.tf"; + httpPort = 3036; + settings.server = { + START_SSH_SERVER = true; + SSH_PORT = 6660; + SSH_DOMAIN = "git.rhizome.tf"; + DISABLE_SSH = false; + }; + rootUrl = "https://git.rhizome.tf"; + settings.service.DISABLE_REGISTRATION = true; + settings.webhook.ALLOWED_HOST_LIST = "external,loopback"; + }; + + # systemd.services.spore = { + # wantedBy = [ "multi-user.target" ]; + # description = "Spore Deployment Tool"; + # serviceConfig = { + # User = "spore"; + # Restart = "on-failure"; + # ExecStart = "${lib.getExe pkgs.spore}"; + + # }; + # }; + + systemd.services.grab-keys = { + description = "Server Key Grabber"; + serviceConfig = { + Type = "oneshot"; + User = "spore"; + Restart = "on-failure"; + ExecStart = "${pkgs.openssh}/bin/scp spore@server.rhizome.tf:/etc/letsencrypt/live/server.rhizome.tf/cert.pem /var/www/server.pem"; + }; + }; + + systemd.timers.grab-keys = { + description = "Server Key Grabber"; + timerConfig = { + Persistent = "yes"; + OnCalendar = "daily"; + Unit = "grab-keys.service"; + }; + }; + + systemd.services.woodpecker-server = { + wantedBy = ["multi-user.target"]; + description = "woodpecker CI/CD server"; + serviceConfig = { + Environment = [ + "WOODPECKER_OPEN=true" + "WOODPECKER_ADMIN=dbx" + "WOODPECKER_REPO_OWNERS=rhizome" + "WOODPECKER_HOST=https://ci.rhizome.tf" + "WOODPECKER_GITEA=true" + "WOODPECKER_GITEA_URL=https://git.rhizome.tf" + "WOODPECKER_GITEA_CLIENT=86bb265b-8914-4abd-a3eb-f843fabbd79d" + "WOODPECKER_GITEA_SECRET=gto_474i24aku3vda6wjbumdgfdcjdllclecfplfb4wsz2ibkemhdrwq" + "WOODPECKER_GITEA_SKIP_VERIFY=true" + "WOODPECKER_AGENT_SECRET=71a0ac7d617aef46fb93811c6e2a300e041a324727df12b4805d5f4e9e1f3326" + "WOODPECKER_DATABASE_DATASOURCE=/var/lib/woodpecker/woodpecker.sqlite" + ]; + Restart = "on-failure"; + ExecStart = "${lib.getExe pkgs.woodpecker-server}"; + User = "ci"; + Group = "ci"; + }; + }; + + systemd.services.woodpecker-agent = { + wantedBy = ["multi-user.target"]; + description = "woodpecker CI/CD agent"; + serviceConfig = { + Environment = [ + "WOODPECKER_AGENT_SECRET=71a0ac7d617aef46fb93811c6e2a300e041a324727df12b4805d5f4e9e1f3326" + ]; + Restart = "always"; + ExecStart = "${lib.getExe pkgs.woodpecker-agent}"; + User = "ci-agent"; + Group = "ci"; + }; + }; + + systemd.services.felix = { + wantedBy = ["multi-user.target"]; + description = "gilles on testing"; + serviceConfig = { + ExecStart = ''${lib.getExe pkgs.docker} run --network host -v /var/lib/acme/rhizome.tf:/var/lib/acme/rhizome.tf --env-file /var/www/felix_env git.rhizome.tf/rhizome/gilles:latest''; + Group = "www"; + User = "felix"; + Restart = "always"; + }; + }; + + services.caddy = { + enable = true; + virtualHosts = { + "rhizome.tf".extraConfig = '' + route /.well-known/acme-challenge/* { + root * /var/www/acme-challenge + file_server + } + root * /var/www/rhizome.tf + file_server + handle_errors { + @404 { + expression {http.error.status_code} == 404 + } + rewrite @404 /404.html + file_server + } + ''; + "git.rhizome.tf".extraConfig = '' + reverse_proxy http://localhost:3036 + ''; + "ci.rhizome.tf".extraConfig = '' + reverse_proxy http://localhost:8000 + ''; + }; + group = "www"; + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + kitty + helix + ripgrep + fd + exa + bat + nix-index + comma + alejandra + curl + cachix + git + man-pages + man-pages-posix + rnix-lsp + zellij + zoxide + fzf + btop + ]; + documentation.dev.enable = true; + documentation.man.enable = true; + documentation.enable = true; + programs.nix-index-database.comma.enable = true; + programs.nix-index.enableZshIntegration = false; + programs.nix-index.enableBashIntegration = false; + + services.openssh = { + enable = true; + passwordAuthentication = false; + kbdInteractiveAuthentication = false; + permitRootLogin = "no"; + }; + + networking.firewall.allowedTCPPorts = [22 80 443 5539 5559 6660]; + networking.firewall.allowedUDPPorts = [443 6660]; + + security.acme = { + acceptTerms = true; + defaults.email = "admin@rhizome.tf"; + defaults.group = "www"; + certs."rhizome.tf" = { + webroot = "/var/www/acme-challenge"; + }; + }; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It's perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "23.05"; # Did you read the comment? + + system.activationScripts = { + acls.text = '' + ${pkgs.acl}/bin/setfacl -Rm spore:rx /var/lib/acme/rhizome.tf + ''; + }; +} diff --git a/system/servers/rhizome-vps/flake.lock b/system/servers/rhizome-vps/flake.lock new file mode 100644 index 0000000..6587aec --- /dev/null +++ b/system/servers/rhizome-vps/flake.lock @@ -0,0 +1,125 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688466019, + "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1687871164, + "narHash": "sha256-bBFlPthuYX322xOlpJvkjUBz0C+MOBjZdDOOJJ+G2jU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "07c347bb50994691d7b0095f45ebd8838cf6bc38", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.05", + "repo": "home-manager", + "type": "github" + } + }, + "nix-index-database": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688874465, + "narHash": "sha256-BUwl+tq40EjkufTZkqf3lWFzxOA/mYBTHz+p5uJtjaY=", + "owner": "Mic92", + "repo": "nix-index-database", + "rev": "757114749d4613cf71f3748e780a1be8a67a5d3c", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "nix-index-database", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1689326639, + "narHash": "sha256-79zi0t83Dcc2dE0NuYZ+2hqtKXZN1yWVq5mtx8D2d7Y=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9fdfaeb7b96f05e869f838c73cde8d98c640c649", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", + "home-manager": "home-manager", + "nix-index-database": "nix-index-database", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "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", + "version": 7 +} diff --git a/system/servers/rhizome-vps/flake.nix b/system/servers/rhizome-vps/flake.nix new file mode 100644 index 0000000..89a37a9 --- /dev/null +++ b/system/servers/rhizome-vps/flake.nix @@ -0,0 +1,53 @@ +{ + description = "rhizome dev server"; + inputs = { + nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; + + flake-parts = { + url = "github:hercules-ci/flake-parts"; + inputs.nixpkgs-lib.follows = "nixpkgs"; + }; + + flake-utils.url = "github:numtide/flake-utils"; + + home-manager = { + url = "github:nix-community/home-manager/release-23.05"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + nix-index-database = { + url = "github:Mic92/nix-index-database"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = { + self, + nixpkgs, + home-manager, + nix-index-database, + ... + } @ inputs: let + inherit (self) outputs; + forAllSystems = nixpkgs.lib.genAttrs [ + "x86_64-linux" + ]; + in rec { + nixosConfigurations = { + "filament" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = {inherit inputs outputs;}; + modules = [ + ./configuration.nix + nix-index-database.nixosModules.nix-index + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.extraSpecialArgs = {inherit inputs outputs;}; + home-manager.users.rhizome.imports = [./rhizome.nix]; + } # hm + ]; # modules + }; # filament + }; + }; # rec +} diff --git a/system/servers/rhizome-vps/hardware-configuration.nix b/system/servers/rhizome-vps/hardware-configuration.nix new file mode 100644 index 0000000..7c8418f --- /dev/null +++ b/system/servers/rhizome-vps/hardware-configuration.nix @@ -0,0 +1,34 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = []; + + boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/f4889546-f71c-4e3c-ab47-e183a72dc52e"; + fsType = "ext4"; + }; + + swapDevices = []; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.ens3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + virtualisation.hypervGuest.enable = true; +} diff --git a/system/servers/rhizome-vps/rhizome.nix b/system/servers/rhizome-vps/rhizome.nix new file mode 100644 index 0000000..ecd7d6a --- /dev/null +++ b/system/servers/rhizome-vps/rhizome.nix @@ -0,0 +1,130 @@ +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: { + home.packages = with pkgs; [ + lazygit + alejandra + ]; + + home = { + username = "rhizome"; + homeDirectory = "/home/rhizome"; + }; + + programs.direnv = { + enable = true; + nix-direnv = { + enable = true; + }; + }; + + programs.git = { + enable = true; + userName = "rhizome"; + userEmail = "filament@rhizome.tf"; + }; + + programs.fzf = { + enable = true; + enableZshIntegration = true; + }; + + programs.helix = { + enable = true; + settings = { + theme = "base16_terminal"; + editor.lsp.display-messages = true; + }; + }; + + programs.zsh = { + enable = true; + enableAutosuggestions = true; + enableCompletion = true; + enableSyntaxHighlighting = true; + enableVteIntegration = true; + autocd = true; + defaultKeymap = "viins"; + initExtra = '' + [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh + alias ...='cd ../..' + alias ....='cd ../../..' + alias .....='cd ../../../..' + alias chmox='chmod +x' + alias gs='git status' + alias gcl='git clone' + alias ga='git add' + alias gcb='git checkout -b' + alias gco='git checkout' + alias gl='git pull' + alias gp='git push' + alias gd='git diff' + alias gcam='git commit -am' + alias gcm='git commit -m' + alias gr='git restore' + alias gm='git merge' + alias l='exa -lh --group-directories-first --icons --color=always' + alias la='exa -lha --group-directories-first --icons --color=always' + eval "$(zoxide init zsh)" + ''; + plugins = [ + { + name = "powerlevel10k"; + src = pkgs.zsh-powerlevel10k; + file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; + } + { + name = "zsh-vi-mode"; + src = pkgs.zsh-vi-mode; + file = "share/zsh-vi-mode/zsh-vi-mode.zsh"; + } + { + name = "zsh-autopair"; + src = pkgs.zsh-autopair; + file = "share/zsh-autopair/zsh-autopair.zsh"; + } + { + name = "zsh-completions"; + src = pkgs.zsh-completions; + file = "share/zsh-completions/zsh-completions.zsh"; + } + { + name = "zsh-command-time"; + src = pkgs.zsh-command-time; + file = "share/zsh-completions/zsh-command-time.zsh"; + } + { + name = "zsh-autocomplete"; + src = pkgs.zsh-autocomplete; + file = "share/zsh-autocomplete/zsh-autocomplete.zsh"; + } + { + name = "zsh-fast-syntax-highlighting"; + src = pkgs.zsh-fast-syntax-highlighting; + file = "share/zsh-fast-syntax-highlighting/zsh-fast-syntax-highlighting.zsh"; + } + { + name = "zsh-nix-shell"; + src = pkgs.zsh-nix-shell; + file = "share/zsh-nix-shell/zsh-nix-shell.zsh"; + } + { + name = "any-nix-shell"; + src = pkgs.any-nix-shell; + file = "share/any-nix-shell/any-nix-shell.zsh"; + } + { + name = "nix-zsh-completions"; + src = pkgs.nix-zsh-completions; + file = "share/nix-zsh-completions/nix-zsh-completions.zsh"; + } + ]; + }; + + home.stateVersion = "23.05"; +} diff --git a/gtk-theme.nix b/util/gtk-theme.nix similarity index 100% rename from gtk-theme.nix rename to util/gtk-theme.nix diff --git a/util/overlay.nix b/util/overlay.nix new file mode 100644 index 0000000..c068062 --- /dev/null +++ b/util/overlay.nix @@ -0,0 +1,15 @@ +{inputs, ...}: { + additions = final: _prev: import ../.old/pkgs {pkgs = final;}; + pkg-sets = final: prev: { + unstable = import inputs.nixpkgs { + system = final.system; + config.allowUnfree = true; + }; + stable = import inputs.nixpkgs-stable { + system = final.system; + config.allowUnfree = true; + }; + }; + + rice = import ./rice.nix; +} diff --git a/pal.conf b/util/pal.conf similarity index 100% rename from pal.conf rename to util/pal.conf diff --git a/rice.nix b/util/rice.nix similarity index 100% rename from rice.nix rename to util/rice.nix