diff options
| -rw-r--r-- | flake.lock | 68 | ||||
| -rw-r--r-- | flake.nix | 14 | ||||
| -rw-r--r-- | home/default.nix | 1 | ||||
| -rw-r--r-- | home/ebisu/fortune/nix/default.nix | 19 | ||||
| -rw-r--r-- | justfile | 4 |
5 files changed, 65 insertions, 41 deletions
@@ -512,14 +512,17 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_3" + "systems": [ + "rui", + "systems" + ] }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -530,17 +533,14 @@ }, "flake-utils_6": { "inputs": { - "systems": [ - "tsutsumi", - "systems" - ] + "systems": "systems_3" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -553,16 +553,15 @@ "inputs": { "systems": [ "tsutsumi", - "rui", "systems" ] }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -617,7 +616,7 @@ "gitignore_3": { "inputs": { "nixpkgs": [ - "tsutsumi", + "rui", "pre-commit-hooks", "nixpkgs" ] @@ -640,7 +639,6 @@ "inputs": { "nixpkgs": [ "tsutsumi", - "rui", "pre-commit-hooks", "nixpkgs" ] @@ -1539,7 +1537,7 @@ "flake-compat": "flake-compat_9", "gitignore": "gitignore_3", "nixpkgs": [ - "tsutsumi", + "rui", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable_3" @@ -1564,7 +1562,6 @@ "gitignore": "gitignore_4", "nixpkgs": [ "tsutsumi", - "rui", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable_4" @@ -1645,6 +1642,7 @@ "pia": "pia", "pre-commit-hooks": "pre-commit-hooks_2", "pywal-nix": "pywal-nix", + "rui": "rui", "spicetify-nix": "spicetify-nix", "systems": "systems_4", "tailray": "tailray", @@ -1653,24 +1651,22 @@ }, "rui": { "inputs": { - "flake-compat": "flake-compat_10", - "flake-utils": "flake-utils_7", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_5", "nixpkgs": [ - "tsutsumi", "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks_5", + "pre-commit-hooks": "pre-commit-hooks_4", "systems": [ - "tsutsumi", "systems" ] }, "locked": { - "lastModified": 1726551771, - "narHash": "sha256-T1SgvqDCnun0eemqRI1rj2JRgHmttlldN54ybjy+NcY=", + "lastModified": 1726623275, + "narHash": "sha256-jnVUPMXBmdNg4dlFlsdDgu5xL6+LtJFab8JQ4JipQAc=", "owner": "Fuwn", "repo": "rui", - "rev": "f29e1c00b7d8dfd098449a9fd19bec24c5ce7a2d", + "rev": "9921859560f2e20aed81ff6553c7c25eac030c62", "type": "github" }, "original": { @@ -1738,7 +1734,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_6", "nixpkgs": [ "nixpkgs" ] @@ -1860,23 +1856,25 @@ }, "tsutsumi": { "inputs": { - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_6", + "flake-compat": "flake-compat_10", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks": "pre-commit-hooks_4", - "rui": "rui", + "pre-commit-hooks": "pre-commit-hooks_5", + "rui": [ + "rui" + ], "systems": [ "systems" ] }, "locked": { - "lastModified": 1726605903, - "narHash": "sha256-2c5yQlcLUKA0LIA71YvCYuZdN49MG3yU8HRq2Xub1mM=", + "lastModified": 1726623422, + "narHash": "sha256-ARLPI3AsOMO9Ojpb9IVrk+FiH+PZZMd9OTqmeVW32OA=", "owner": "Fuwn", "repo": "tsutsumi", - "rev": "4306f7e4afb1ff83d9117e29a87bc0d7f7f81cde", + "rev": "9163df877d00805d584a8ad1105768e9da9d28c4", "type": "github" }, "original": { @@ -137,12 +137,22 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - tsutsumi = { - url = "github:Fuwn/tsutsumi"; + rui = { + url = "github:Fuwn/rui"; inputs.nixpkgs.follows = "nixpkgs"; inputs.systems.follows = "systems"; }; + tsutsumi = { + url = "github:Fuwn/tsutsumi"; + + inputs = { + nixpkgs.follows = "nixpkgs"; + systems.follows = "systems"; + rui.follows = "rui"; + }; + }; + flake-registry = { url = "github:NixOS/flake-registry"; flake = false; diff --git a/home/default.nix b/home/default.nix index f56cfa2..1af58d3 100644 --- a/home/default.nix +++ b/home/default.nix @@ -27,6 +27,7 @@ in ./${username} inputs.chaotic.homeManagerModules.default inputs.pywal-nix.homeManagerModules.${pkgs.system}.default + inputs.rui.homeManagerModules.${pkgs.system}.default ]; extraSpecialArgs = { diff --git a/home/ebisu/fortune/nix/default.nix b/home/ebisu/fortune/nix/default.nix index 1b6117b..d2193d8 100644 --- a/home/ebisu/fortune/nix/default.nix +++ b/home/ebisu/fortune/nix/default.nix @@ -1,4 +1,10 @@ -{ pkgs, inputs, ... }: +{ + pkgs, + inputs, + flakeDirectory, + config, + ... +}: { imports = [ ./development @@ -24,6 +30,15 @@ cached-nix-shell omnix.packages.${pkgs.system}.default nix-search.packages.${system}.default - tsutsumi.packages.${pkgs.system}.rui ]; + + programs.rui = { + enable = true; + + settings = { + notify = true; + editor = "code"; + flake = "${config.home.homeDirectory}/${flakeDirectory}"; + }; + }; } @@ -7,11 +7,11 @@ default: os hostname='kansai': git add . - rui os switch --hostname {{hostname}} + rui os switch --hostname {{hostname}} -- --impure home user='ebisu': git add . - rui home switch --user {{user}} + rui home switch --user {{user}} -- --impure news user='ebisu': rui home news --user {{user}} |