From a353993421740dec3c1c3a7215219ac86cef44da Mon Sep 17 00:00:00 2001 From: Armel van Ravels Date: Fri, 12 Jun 2026 15:47:01 +0200 Subject: [PATCH] feature/26-05 (#17) Reviewed-on: https://git.een.ninja/armel/nix-config/pulls/17 Co-authored-by: Armel van Ravels Co-committed-by: Armel van Ravels --- flake.lock | 28 ++++++++++++++-------------- flake.nix | 4 ++-- systems/balrog/default.nix | 1 + systems/gandalf/default.nix | 2 ++ systems/modules/bitwarden.nix | 12 ++++++++++++ systems/modules/home/home.nix | 2 +- systems/modules/home/wm/hyprland.nix | 2 +- systems/modules/ollama.nix | 2 -- systems/work/default.nix | 1 + 9 files changed, 34 insertions(+), 20 deletions(-) create mode 100644 systems/modules/bitwarden.nix diff --git a/flake.lock b/flake.lock index 71fd460..9be41d8 100644 --- a/flake.lock +++ b/flake.lock @@ -7,27 +7,27 @@ ] }, "locked": { - "lastModified": 1779506708, - "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", + "lastModified": 1781184346, + "narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", + "rev": "ea6d221d7aa85652d014b6f719dddf036037515b", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } }, "nix-flatpak": { "locked": { - "lastModified": 1777402031, - "narHash": "sha256-6gkfl9y3+ti0Z6dgby8/R4/DRT8sWU0I0TLCIxwWtjk=", + "lastModified": 1780908363, + "narHash": "sha256-llGS4y3Qh1eUkli3/Y2VY9FV3GOUKFZR1E2BDftt45Q=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "22a3adbe7c5c8c8a10a635d32c9ef7fc01a6e4b8", + "rev": "1df08625f0f8c7d6e300a0e5df7955bbb877d809", "type": "github" }, "original": { @@ -38,27 +38,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779467186, - "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", + "lastModified": 1780902259, + "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", + "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1779694939, - "narHash": "sha256-Ly4j75O8ICaSQx3uxPnwk2x7PMF0XQvn5r0c3yBA7FI=", + "lastModified": 1781141223, + "narHash": "sha256-Eye4UQJjC4TLobclolFCMl6MrjgiF6Bk1cOI5x8SH00=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9d8b65950353691ab56561e7c73d2e1063d810b", + "rev": "b503dde361500433ca25a32e8f4d218bf58fb659", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 57dccd1..4c46596 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs = { - url = "github:nixos/nixpkgs/nixos-25.11"; + url = "github:nixos/nixpkgs/nixos-26.05"; }; nixpkgs-unstable = { @@ -11,7 +11,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/systems/balrog/default.nix b/systems/balrog/default.nix index 136d772..2d89ee4 100644 --- a/systems/balrog/default.nix +++ b/systems/balrog/default.nix @@ -19,6 +19,7 @@ ../modules/bambu-studio-flatpak.nix ../modules/arduino-ide.nix ../modules/devenv.nix + ../modules/bitwarden.nix ]; boot.kernelPackages = pkgs.linuxPackages_latest; diff --git a/systems/gandalf/default.nix b/systems/gandalf/default.nix index e0f45f8..1668a23 100644 --- a/systems/gandalf/default.nix +++ b/systems/gandalf/default.nix @@ -25,6 +25,7 @@ ../modules/openscad.nix ../modules/bambu-studio-flatpak.nix ../modules/arduino-ide.nix + ../modules/bitwarden.nix ]; boot.kernelPackages = pkgs.linuxPackages_latest; @@ -35,6 +36,7 @@ networking.hostName = "gandalf"; networking.networkmanager.enable = true; networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ]; + networking.firewall.enable = false; home-manager.users.avravels.home.hyprland.execOnce = [ "waybar" diff --git a/systems/modules/bitwarden.nix b/systems/modules/bitwarden.nix new file mode 100644 index 0000000..3a7a665 --- /dev/null +++ b/systems/modules/bitwarden.nix @@ -0,0 +1,12 @@ +{ config, pkgs, ... }: + +{ + nixpkgs.config.permittedInsecurePackages = [ + "electron-39.8.10" + ]; + + environment.systemPackages = with pkgs; [ + bitwarden-desktop + ]; +} + diff --git a/systems/modules/home/home.nix b/systems/modules/home/home.nix index 9bfe300..4b943c8 100644 --- a/systems/modules/home/home.nix +++ b/systems/modules/home/home.nix @@ -9,7 +9,7 @@ imports = [ ./other/fonts.nix - ./programs/bitwarden.nix +# ./programs/bitwarden.nix ./programs/kitty.nix ./programs/zsh.nix ./programs/direnv.nix diff --git a/systems/modules/home/wm/hyprland.nix b/systems/modules/home/wm/hyprland.nix index 6170424..839a51e 100644 --- a/systems/modules/home/wm/hyprland.nix +++ b/systems/modules/home/wm/hyprland.nix @@ -69,7 +69,7 @@ in shadow = { enabled = true; color = "rgba(00000055)"; - ignore_window = true; + #ignore_window = true; offset = "0 15"; range = 100; render_power = 2; diff --git a/systems/modules/ollama.nix b/systems/modules/ollama.nix index c13e575..4712ca4 100644 --- a/systems/modules/ollama.nix +++ b/systems/modules/ollama.nix @@ -5,6 +5,4 @@ enable = true; package = pkgsUnstable.ollama-cuda; }; - - services.open-webui.enable = true; } diff --git a/systems/work/default.nix b/systems/work/default.nix index 1b6607d..fe970f9 100644 --- a/systems/work/default.nix +++ b/systems/work/default.nix @@ -23,6 +23,7 @@ ../modules/jq.nix ../modules/enova.nix ../modules/devenv.nix + ../modules/bitwarden.nix ]; boot.kernelPackages = pkgs.linuxPackages_latest;