diff options
| -rw-r--r-- | common/modules/mango/swayidleNdLock.nix | 2 | ||||
| -rw-r--r-- | flake.lock | 30 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | hosts/nixios/default.nix | 1 | ||||
| -rw-r--r-- | users/common.nix | 1 |
5 files changed, 12 insertions, 23 deletions
diff --git a/common/modules/mango/swayidleNdLock.nix b/common/modules/mango/swayidleNdLock.nix index 959ea45..ff2bde4 100644 --- a/common/modules/mango/swayidleNdLock.nix +++ b/common/modules/mango/swayidleNdLock.nix @@ -29,7 +29,7 @@ in { timeout = 270; command = "${pkgs.brightnessctl}/bin/brightnessctl g > /tmp/brightness_prev && ${pkgs.brightnessctl}/bin/brightnessctl set 10%"; - resumeCommand = "${pkgs.brightnessctl}/bin/brightnessctl set $(cat /tmp/brightness_prev || echo 100%)"; + resumeCommand = "${pkgs.brightnessctl}/bin/brightnessctl set $(${pkgs.coreutils}/bin/cat /tmp/brightness_prev 2>/dev/null || echo 100%)"; } # Lock at 5:00 { @@ -4,7 +4,9 @@ "inputs": { "neovim-nightly-overlay": "neovim-nightly-overlay", "nixCats": "nixCats", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "plugins-lze": "plugins-lze", "plugins-lzextras": "plugins-lzextras", "plugins-neogit": "plugins-neogit", @@ -322,7 +324,7 @@ "inputs": { "flake-parts": "flake-parts_3", "neovim-src": "neovim-src_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1770509107, @@ -448,22 +450,6 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1772927210, - "narHash": "sha256-FdRDRoV0jRTiPK5ID22BaUX5P0wdsclpxtIOjaEy9Lo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "0e6cdd5be64608ef630c2e41f8d51d484468492f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { "lastModified": 1770380644, "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", "owner": "NixOS", @@ -478,7 +464,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1770380644, "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", @@ -494,7 +480,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1772963539, "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", @@ -580,7 +566,7 @@ "gen-luarc": "gen-luarc", "git-hooks": "git-hooks", "neovim-nightly-overlay": "neovim-nightly-overlay_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "vimcats": "vimcats" }, "locked": { @@ -604,7 +590,7 @@ "home-manager": "home-manager", "mango": "mango", "mydwm": "mydwm", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "sops-nix": "sops-nix", "zen-browser": "zen-browser" } @@ -12,6 +12,7 @@ flake-parts.url = "github:hercules-ci/flake-parts"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; beeVim.url = "git+https://codeberg.org/brustybee/beeVim"; + beeVim.inputs.nixpkgs.follows = "nixpkgs"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/nixios/default.nix b/hosts/nixios/default.nix index dab1c42..0ed1393 100644 --- a/hosts/nixios/default.nix +++ b/hosts/nixios/default.nix @@ -85,6 +85,7 @@ extraGroups = [ "networkmanager" "wheel" + "video" ]; }; diff --git a/users/common.nix b/users/common.nix index 6738336..2d62370 100644 --- a/users/common.nix +++ b/users/common.nix @@ -101,6 +101,7 @@ papers cava element-desktop + zed-editor-fhs (pkgs.obsidian.override { electron = pkgs.electron_40; }) |