diff --git a/common/desktop/home.nix b/common/desktop/home.nix index dfc15b78..dccbe87d 100644 --- a/common/desktop/home.nix +++ b/common/desktop/home.nix @@ -50,11 +50,6 @@ programs = { rust.enable = true; }; - riff = { - enable = true; - direnv = true; - }; - firefox.enable = true; chromium = { diff --git a/common/hm-modules/default.nix b/common/hm-modules/default.nix index af1e0614..aabb18cb 100644 --- a/common/hm-modules/default.nix +++ b/common/hm-modules/default.nix @@ -1,3 +1,10 @@ -{ ... }: { - imports = [ ./catppuccin ./nvim ./riff.nix ./vscode.nix ./git.nix ./rust.nix ]; +{ ... }: +{ + imports = [ + ./catppuccin + ./nvim + ./vscode.nix + ./git.nix + ./rust.nix + ]; } diff --git a/common/hm-modules/riff.nix b/common/hm-modules/riff.nix deleted file mode 100644 index 509a782d..00000000 --- a/common/hm-modules/riff.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ config, pkgs, lib, inputs, ... }: -with lib; -let cfg = config.programs.riff; -in { - options.programs.riff = { - enable = mkEnableOption "riff"; - direnv = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable direnv support - ''; - }; - }; - config = mkIf cfg.enable { - home.packages = [ inputs.riff.packages.${pkgs.system}.riff ]; - - xdg.configFile."direnv/lib/riff.sh" = mkIf cfg.direnv { - executable = true; - text = '' - use_riff() { - watch_file Cargo.toml watch_file Cargo.lock - eval "$(riff --offline print-dev-env)" - } - ''; - }; - }; -} diff --git a/flake.lock b/flake.lock index 8667aff4..ad5f90dd 100644 --- a/flake.lock +++ b/flake.lock @@ -1,52 +1,13 @@ { "nodes": { - "alejandra": { - "inputs": { - "fenix": "fenix_2", - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "webcord", - "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" - } - }, "attic": { "inputs": { "crane": "crane", "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { @@ -83,7 +44,7 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "stable": "stable" }, "locked": { @@ -104,7 +65,7 @@ "inputs": { "flake-compat": "flake-compat_3", "naersk": "naersk", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { @@ -163,26 +124,10 @@ "type": "github" } }, - "crane_3": { - "flake": false, - "locked": { - "lastModified": 1670284777, - "narHash": "sha256-JF0pc0s4z/X+Iy+lNHOwUQ8I5bz+q7uX4HrKTNIEj24=", - "owner": "ipetkov", - "repo": "crane", - "rev": "2243fb9c872de25cb564a02d324ea6a5b9853052", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "deploy": { "inputs": { "flake-compat": "flake-compat_4", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "utils": "utils_2" }, "locked": { @@ -221,59 +166,12 @@ "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_3", - "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": [ - "webcord", - "nixpkgs" - ], - "poetry2nix": "poetry2nix", - "pre-commit-hooks": "pre-commit-hooks_2" - }, - "locked": { - "lastModified": 1670715183, - "narHash": "sha256-l3OhVCCimrN1HFPfqfKAyzuMuPxNXZYLsI9w7AaQXv8=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "3d6f13ef9d4cb8c41bc83383bbec3e74865ef90d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, "essentials": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1704366612, @@ -289,52 +187,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "riff", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1686896497, - "narHash": "sha256-IphIS1KpiFXp/j0v7mEMhtw51uvU5F0mqF2j4//7VAA=", - "owner": "nix-community", - "repo": "fenix", - "rev": "9c69d11badcd78710d7d8665bc3d2e1adc450ffe", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { - "inputs": { - "nixpkgs": [ - "webcord", - "dream2nix", - "alejandra", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src_2" - }, - "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", - "owner": "nix-community", - "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -519,24 +371,6 @@ "type": "github" } }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1668450977, - "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -571,21 +405,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_10": { "inputs": { "systems": "systems_11" @@ -777,38 +596,6 @@ "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": [ @@ -874,22 +661,6 @@ "url": "https://git.0x76.dev/v/gnome-autounlock-keyring.git" } }, - "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" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -973,21 +744,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" - } - }, "mailserver": { "inputs": { "blobs": "blobs", @@ -1014,7 +770,7 @@ "microvm": { "inputs": { "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_4", "spectrum": "spectrum" }, "locked": { @@ -1053,31 +809,10 @@ "type": "github" } }, - "naersk_2": { - "inputs": { - "nixpkgs": [ - "riff", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1686572087, - "narHash": "sha256-jXTut7ZSYqLEgm/nTk7TuVL2ExahTip605bLINklAnQ=", - "owner": "nix-community", - "repo": "naersk", - "rev": "8507af04eb40c5520bd35d9ce6f9d2342cea5ad1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nix": { "inputs": { "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_7", "nixpkgs-regression": "nixpkgs-regression" }, "locked": { @@ -1114,22 +849,6 @@ "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" - } - }, "nixlib": { "locked": { "lastModified": 1710636348, @@ -1183,32 +902,14 @@ }, "nixpkgs": { "locked": { - "lastModified": 1702539185, - "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1665349835, - "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", - "type": "github" - }, - "original": { - "dir": "lib", "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", @@ -1263,71 +964,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1645296114, - "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-21.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1696165369, - "narHash": "sha256-pd1cjFHCoEf9q5f9B0HhlOwwpBI9RP3HbUE6xjI7wAI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d7186d62bb68fac3c90f1d95515e613ef299e992", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_12": { - "locked": { - "lastModified": 1670507980, - "narHash": "sha256-riNZa0xzM1it3pzxciwALeMs+0CsBMWIW2FqulzK8vM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2787fc7d1e51404678614bf0fe92fc296746eec0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1710159071, "narHash": "sha256-CT0WKgcmlcWZPZL/sSSICN/Vbm4Of0ZDgxc0GFf6sYU=", @@ -1343,7 +980,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1702272962, "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", @@ -1359,23 +996,7 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1708475490, "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", @@ -1391,7 +1012,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1710861126, "narHash": "sha256-q8fiy9mgUvTAt2OMjiVpQgDlykyGury9Fpsm0jekBfY=", @@ -1406,7 +1027,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1710806803, "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", @@ -1422,18 +1043,34 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_7": { "locked": { - "lastModified": 1686736559, - "narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=", - "owner": "nixos", + "lastModified": 1645296114, + "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddf4688dc7aeb14e8a3c549cb6aa6337f187a884", + "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-23.05", + "owner": "NixOS", + "ref": "nixos-21.05-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1696165369, + "narHash": "sha256-pd1cjFHCoEf9q5f9B0HhlOwwpBI9RP3HbUE6xjI7wAI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d7186d62bb68fac3c90f1d95515e613ef299e992", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1445,7 +1082,7 @@ "flake-parts": "flake-parts_2", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -1477,23 +1114,6 @@ "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_8", @@ -1553,53 +1173,6 @@ "type": "github" } }, - "pre-commit-hooks_2": { - "inputs": { - "flake-utils": [ - "webcord", - "dream2nix", - "flake-utils-pre-commit" - ], - "nixpkgs": [ - "webcord", - "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" - } - }, - "riff": { - "inputs": { - "fenix": "fenix", - "naersk": "naersk_2", - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1690193312, - "narHash": "sha256-JZQoHRBpNM1ucZ9A9ZE3Q67z8AuaBa/WKIS2Wm8zHHo=", - "owner": "DeterminateSystems", - "repo": "riff", - "rev": "aec5418dbae0c468652eaac7f8f3d85ed83c89ce", - "type": "github" - }, - "original": { - "owner": "DeterminateSystems", - "repo": "riff", - "type": "github" - } - }, "root": { "inputs": { "attic": "attic", @@ -1615,48 +1188,12 @@ "microvm": "microvm", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "nur": "nur", - "riff": "riff", "t": "t", "vault-secrets": "vault-secrets", - "vault-unseal": "vault-unseal", - "webcord": "webcord" - } - }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1686818168, - "narHash": "sha256-yyoJmC17T6mXqthzgGiTKSdUJ0cTEuqQmkmd3iW4ay8=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "ff864fbb9fc21f0cdae408fe8f5b2f43141b45a7", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_2": { - "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" + "vault-unseal": "vault-unseal" } }, "rust-overlay": { @@ -2009,7 +1546,7 @@ "flake-compat": "flake-compat_9", "flake-utils": "flake-utils_11", "nix": "nix", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_8", "utils": "utils_4" }, "locked": { @@ -2046,42 +1583,6 @@ "type": "git", "url": "https://git.0x76.dev/v/vault-unseal.git" } - }, - "webcord": { - "inputs": { - "dream2nix": "dream2nix", - "nixpkgs": "nixpkgs_12", - "webcord": "webcord_2" - }, - "locked": { - "lastModified": 1707338607, - "narHash": "sha256-5UNW3kano8D4kbum+oRx18EjmJ1mLeOCwgGR1nWDwtg=", - "owner": "fufexan", - "repo": "webcord-flake", - "rev": "82ffefda8c5f663d895d24b7500d5f489b5d7d47", - "type": "github" - }, - "original": { - "owner": "fufexan", - "repo": "webcord-flake", - "type": "github" - } - }, - "webcord_2": { - "flake": false, - "locked": { - "lastModified": 1670713990, - "narHash": "sha256-e+y/M+/gjezHoNrdXeFhqtvxbPdhRSDOQlwK1nUhNfo=", - "owner": "SpacingBat3", - "repo": "WebCord", - "rev": "80ba858c025e0bb59510f7136211948d8ae10ece", - "type": "github" - }, - "original": { - "owner": "SpacingBat3", - "repo": "WebCord", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 61ccfcfc..2f92f0e2 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,6 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable-small"; - # nixpkgs_stable.url = "nixpkgs/nixos-23.05"; flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.4.0"; @@ -20,10 +19,6 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - riff.url = "github:DeterminateSystems/riff"; - - webcord.url = "github:fufexan/webcord-flake"; - comma.url = "github:nix-community/comma"; mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; @@ -36,34 +31,47 @@ nixos-hardware.url = "github:nixos/nixos-hardware"; - lanzaboote = { - url = "github:nix-community/lanzaboote"; - - # Optional but recommended to limit the size of your system closure. - inputs.nixpkgs.follows = "nixpkgs"; - }; + lanzaboote.url = "github:nix-community/lanzaboote"; + lanzaboote.inputs.nixpkgs.follows = "nixpkgs"; vault-unseal.url = "git+https://git.0x76.dev/v/vault-unseal.git"; vault-unseal.inputs.nixpkgs.follows = "nixpkgs"; + gnome-autounlock-keyring.url = "git+https://git.0x76.dev/v/gnome-autounlock-keyring.git"; gnome-autounlock-keyring.inputs.nixpkgs.follows = "nixpkgs"; + t.url = "github:jdonszelmann/t-rs"; t.inputs.nixpkgs.follows = "nixpkgs"; attic.url = "github:zhaofengli/attic"; + attic.inputs.nixpkgs.follows = "nixpkgs"; # Website(s) essentials.url = "github:jdonszelmann/essentials"; + essentials.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, flake-utils-plus, nur, attic - , deploy, home-manager, gnome-autounlock-keyring, lanzaboote, t, ... }@inputs: + outputs = + { + self, + nixpkgs, + flake-utils-plus, + nur, + attic, + deploy, + home-manager, + gnome-autounlock-keyring, + lanzaboote, + t, + ... + }@inputs: let pkgs = self.pkgs.x86_64-linux.nixpkgs; apply-local = pkgs.writeShellScriptBin "apply-local" '' - deploy ".#$(cat /etc/hostname)" -s + nh os switch --ask ''; - in flake-utils-plus.lib.mkFlake { + in + flake-utils-plus.lib.mkFlake { # `self` and `inputs` arguments are required inherit self inputs; @@ -71,8 +79,13 @@ supportedSystems = [ "x86_64-linux" ]; # Channels config - channelsConfig = { allowUnfree = true; }; - sharedOverlays = [ (import ./pkgs) nur.overlay ]; + channelsConfig = { + allowUnfree = true; + }; + sharedOverlays = [ + (import ./pkgs) + nur.overlay + ]; # host defaults hostDefaults = { @@ -83,14 +96,19 @@ ./common ]; - specialArgs = { inherit self inputs home-manager; }; + specialArgs = { + inherit self inputs home-manager; + }; }; # hosts hosts = { # TODO: Figure out why this is reversed, and how/why it sets the FQDN "olympus.bastion" = { - modules = [ ./common/generic-vm.nix ./hosts/olympus/bastion ]; + modules = [ + ./common/generic-vm.nix + ./hosts/olympus/bastion + ]; }; aoife = { @@ -112,8 +130,7 @@ remoteBuild = true; profiles = { system = { - path = deploy.lib.x86_64-linux.activate.nixos - self.nixosConfigurations."olympus.bastion"; + path = deploy.lib.x86_64-linux.activate.nixos self.nixosConfigurations."olympus.bastion"; }; }; }; @@ -122,8 +139,7 @@ remoteBuild = true; fastConnection = true; hostname = "aoife"; - profiles.system.path = deploy.lib.x86_64-linux.activate.nixos - self.nixosConfigurations.aoife; + profiles.system.path = deploy.lib.x86_64-linux.activate.nixos self.nixosConfigurations.aoife; }; }; }; @@ -151,18 +167,17 @@ }; # Checks - checks = builtins.mapAttrs - (system: deployLib: deployLib.deployChecks self.deploy) deploy.lib // { - x86_64-linux.mac = pkgs.stdenvNoCC.mkDerivation { - name = "mac check"; - src = self; - dontBuild = true; - doCheck = true; - checkPhase = '' - echo "Hello World" - ''; - installPhase = "mkdir $out"; - }; + checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy.lib // { + x86_64-linux.mac = pkgs.stdenvNoCC.mkDerivation { + name = "mac check"; + src = self; + dontBuild = true; + doCheck = true; + checkPhase = '' + echo "Hello World" + ''; + installPhase = "mkdir $out"; }; + }; }; } diff --git a/hosts/thalassa/null/home/default.nix b/hosts/thalassa/null/home/default.nix index ffd63dde..53ccf7f5 100644 --- a/hosts/thalassa/null/home/default.nix +++ b/hosts/thalassa/null/home/default.nix @@ -129,7 +129,6 @@ in gnome.nautilus grim # Screenshot tool inputs.comma.packages.${pkgs.system}.default - inputs.riff.packages.${pkgs.system}.riff inputs.webcord.packages.${pkgs.system}.default k9s kubectl