Add bitwarden

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781319724,
+        "lastModified": 1781184346,
-        "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
+        "narHash": "sha256-cZRlW47U6A2nWvAmnZeeO6Xvq23gxYbVLel4KxqOrcQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
+        "rev": "ea6d221d7aa85652d014b6f719dddf036037515b",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1781216227,
+        "lastModified": 1780902259,
-        "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
+        "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
+        "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1781359544,
+        "lastModified": 1781141223,
-        "narHash": "sha256-iUuzKQcyXvopYDDzFpMK5eQKP3WIJExYny2kJtbgUcE=",
+        "narHash": "sha256-Eye4UQJjC4TLobclolFCMl6MrjgiF6Bk1cOI5x8SH00=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f11f828c213641c2369a9f1fa31fe31557e3156",
+        "rev": "b503dde361500433ca25a32e8f4d218bf58fb659",
         "type": "github"
       },
       "original": {

systems/balrog/default.nix

@@ -19,7 +19,7 @@
       ../modules/bambu-studio-flatpak.nix
       ../modules/arduino-ide.nix
       ../modules/devenv.nix
-#      ../modules/bitwarden.nix
+      ../modules/bitwarden.nix
     ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;

systems/modules/btop.nix

@@ -1,8 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    btop
-  ];
-}
-

systems/modules/home/programs/firefox.nix

@@ -1,9 +1,9 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 {
   programs.firefox = {
     enable = true;
-    configPath = "${config.xdg.configHome}/mozilla/firefox";
+
     profiles.default = {
       settings = {
         "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";

systems/modules/home/programs/nvim.nix

@@ -3,8 +3,6 @@
 {
   programs.neovim = {
     enable = true;
-    withRuby = false;
-    withPython3 = false;
     defaultEditor = true;
     extraLuaPackages = ps: [ ps.magick ];
     extraPackages = [
@@ -29,7 +27,7 @@
       image-nvim
     ];
 
-    initLua = ''
+    extraLuaConfig = ''
       vim.cmd("colorscheme catppuccin-mocha")
       -- Basic settings
       vim.o.number = true

systems/modules/home/wm/gtk.nix

@@ -15,7 +15,6 @@
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
     };
-    gtk4.theme = null;
   };
 
   home.sessionVariables = {

systems/modules/home/wm/hyprland.nix

@@ -23,145 +23,133 @@ in
 
     wayland.windowManager.hyprland = {
       enable = true;
-      configType = "lua";
-      settings =
-      let
-        mkLuaInline = lib.generators.mkLuaInline;
-        toLua = lib.generators.toLua;
-        mkArgs = args: { _args = args; };
-        bind =
-          keys: dispatcher: options:
-          mkArgs [
-            keys
-            dispatcher
-            options
-          ];
-        dsp = {
-          exec_cmd = app: mkLuaInline ''hl.dsp.exec_cmd("${app}")'';
-          focus = arg: mkLuaInline "hl.dsp.focus(${toLua { } arg})";
-          window = {
-            move = arg: mkLuaInline "hl.dsp.window.move(${toLua { } arg})";
-            drag = mkLuaInline "hl.dsp.window.drag()";
-            resize = mkLuaInline "hl.dsp.window.resize()";
-            close = mkLuaInline "hl.dsp.window.close()";
-            kill = mkLuaInline "hl.dsp.window.kill()";
-            fullscreen = mkLuaInline "hl.dsp.window.fullscreen()";
-          };
-          exit = mkLuaInline "hl.dsp.exit()";
-          workspace = {
-            move = arg: mkLuaInline "hl.dsp.workspace.move(${toLua { } arg})";
-          };
-        };
-        mod = "SUPER";
-        workspaces = lib.stringToCharacters "abcdefgimnopqrstuvwxyz";
-      in
-      {
-        config = {
-          general = {
-            resize_on_border = true;
-            allow_tearing = true;
-          };
 
-          animations.enabled = true;
+      settings = {
-
+        ### MONITOR
-          decoration = {
+        monitor = [
-            inactive_opacity = 0.8;
+          "eDP-1,1920x1200,auto,1"
-            active_opacity = 0.9;
+          "DP-3,2440x1440,auto,1"
-            rounding = 5;
+          ",preferred,auto,1"
-            rounding_power = 2.5;
-            blur = {
-              enabled = true;
-              brightness = 1.0;
-              contrast = 1.0;
-              noise = 0.01;
-
-              vibrancy = 0.2;
-              vibrancy_darkness = 0.5;
-
-              passes = 4;
-              size = 7;
-
-              popups = true;
-              popups_ignorealpha = 0.2;
-            };
-            shadow = {
-              enabled = true;
-              color = "rgba(00000055)";
-              offset = "0 15";
-              range = 100;
-              render_power = 2;
-              scale = 0.97;
-            };
-          };
-
-          misc = {
-            focus_on_activate = true;
-          };
-        };
-
-        bind = lib.flatten [
-          (bind "${mod} + Q" (dsp.window.kill) { })
-          (bind "${mod} + L" (dsp.exec_cmd "hyprlock") { })
-          (bind "${mod} + D" (dsp.exec_cmd "rofi -show drun") { })
-          (bind "${mod} + B" (dsp.exec_cmd "bzmenu --launcher rofi") { })
-          (bind "${mod} + F" (dsp.window.fullscreen) { })
-          (bind "${mod} + Z" (dsp.exec_cmd "hyprshot -m region") { })
-          (bind "${mod} + M" (dsp.exit) { })
-          (bind "${mod} + SPACE" (dsp.exec_cmd "firefox") { })
-          (bind "${mod} + RETURN" (dsp.exec_cmd "kitty") { })
-
-          (bind "${mod} + SHIFT + LEFT" (dsp.window.move { direction = "l"; }) { })
-          (bind "${mod} + SHIFT + DOWN" (dsp.window.move { direction = "d"; }) { })
-          (bind "${mod} + SHIFT + UP" (dsp.window.move { direction = "u"; }) { })
-          (bind "${mod} + SHIFT + RIGHT" (dsp.window.move { direction = "r"; }) { })
-
-          (bind "${mod} + LEFT" (dsp.focus { direction = "l"; }) { })
-          (bind "${mod} + DOWN" (dsp.focus { direction = "d"; }) { })
-          (bind "${mod} + UP" (dsp.focus { direction = "u"; }) { })
-          (bind "${mod} + RIGHT" (dsp.focus { direction = "r"; }) { })
-
-          (bind "${mod} + 1" (dsp.focus { workspace = 1; }) {})
-          (bind "${mod} + 2" (dsp.focus { workspace = 2; }) {})
-          (bind "${mod} + 3" (dsp.focus { workspace = 3; }) {})
-          (bind "${mod} + 4" (dsp.focus { workspace = 4; }) {})
-          (bind "${mod} + 5" (dsp.focus { workspace = 5; }) {})
-          (bind "${mod} + 6" (dsp.focus { workspace = 6; }) {})
-          (bind "${mod} + 7" (dsp.focus { workspace = 7; }) {})
-          (bind "${mod} + 8" (dsp.focus { workspace = 8; }) {})
-          (bind "${mod} + 9" (dsp.focus { workspace = 9; }) {})
-
-          (bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) {})
-          (bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) {})
-          (bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) {})
-          (bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) {})
-          (bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) {})
-          (bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) {})
-          (bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) {})
-          (bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) {})
-          (bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) {})
-
-          (bind "XF86AudioLowerVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") {
-            repeating = true;
-            locked = true;
-          })
-          (bind "XF86AudioRaiseVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+") {
-            repeating = true;
-            locked = true;
-          })
-          (bind "XF86AudioPlay" (dsp.exec_cmd "playerctl play-pause") { locked = true; })
-          (bind "XF86AudioPrev" (dsp.exec_cmd "playerctl previous") { locked = true; })
-          (bind "XF86AudioNext" (dsp.exec_cmd "playerctl next") { locked = true; })
-
-          (bind "${mod} + mouse:272" dsp.window.drag { mouse = true; })
-          (bind "${mod} + mouse:273" dsp.window.resize { mouse = true; })
         ];
 
-        on = mkArgs [
+        ### VARIABLES
-          "hyprland.start"
+        "$mod" = "SUPER";
-          (mkLuaInline ''
+        "$terminal" = "kitty";
-            function()
+        "$menu" = "rofi -show drun";
-              hl.exec_cmd("waybar")
+        "$bluetoothMenu" = "bzmenu --launcher rofi";
-            end'')
+        "$files" = "rofi -show filebrowser";
+
+        ### BASIC LAYOUT
+        general = {
+          layout = "dwindle";
+          resize_on_border = true;
+        };
+
+        decoration = {
+          inactive_opacity = 0.8;
+          active_opacity = 0.9;
+          rounding = 5;
+          rounding_power = 2.5;
+          blur = {
+            enabled = true;
+            brightness = 1.0;
+            contrast = 1.0;
+            noise = 0.01;
+
+            vibrancy = 0.2;
+            vibrancy_darkness = 0.5;
+
+            passes = 4;
+            size = 7;
+
+            popups = true;
+            popups_ignorealpha = 0.2;
+          };
+
+          shadow = {
+            enabled = true;
+            color = "rgba(00000055)";
+            #ignore_window = true;
+            offset = "0 15";
+            range = 100;
+            render_power = 2;
+            scale = 0.97;
+          };
+        };
+
+        # Use the configurable option here (default `[ "waybar" ]`)
+        exec-once = (if cfg == null then { execOnce = [ "waybar" ]; } else cfg).execOnce;
+
+        ### INPUT
+        input = {
+          kb_layout = "us";
+        };
+
+        ### KEYBINDINGS
+        bind = [
+          # Apps
+          "$mod, RETURN, exec, $terminal"
+          "$mod, D, exec, $menu"
+          "$mod, B, exec, $bluetoothMenu"
+          "$mod, G, exec, $files"
+          "$mod, Q, killactive"
+          "$mod, F, fullscreen"
+          "$mod, M, exit"
+          "$mod, L, exec, hyprlock"
+
+          # show/hide waybar
+          "$mod, W, exec, pkill -SIGUSR1 -f '^waybar$'"
+
+          # Focus
+          "$mod, LEFT,  movefocus, l"
+          "$mod, RIGHT, movefocus, r"
+          "$mod, UP,    movefocus, u"
+          "$mod, DOWN,  movefocus, d"
+
+          # Workspaces
+          "$mod, 1, workspace, 1"
+          "$mod, 2, workspace, 2"
+          "$mod, 3, workspace, 3"
+          "$mod, 4, workspace, 4"
+          "$mod, 5, workspace, 5"
+          "$mod, 6, workspace, 6"
+          "$mod, 7, workspace, 7"
+          "$mod, 8, workspace, 8"
+          "$mod, 9, workspace, 9"
+
+          "$mod SHIFT, 1, movetoworkspace, 1"
+          "$mod SHIFT, 2, movetoworkspace, 2"
+          "$mod SHIFT, 3, movetoworkspace, 3"
+          "$mod SHIFT, 4, movetoworkspace, 4"
+          "$mod SHIFT, 5, movetoworkspace, 5"
+          "$mod SHIFT, 6, movetoworkspace, 6"
+          "$mod SHIFT, 7, movetoworkspace, 7"
+          "$mod SHIFT, 8, movetoworkspace, 8"
+          "$mod SHIFT, 9, movetoworkspace, 9"
+
+          # Window movement
+          "$mod SHIFT, LEFT,  movewindow, l"
+          "$mod SHIFT, RIGHT, movewindow, r"
+          "$mod SHIFT, UP,    movewindow, u"
+          "$mod SHIFT, DOWN,  movewindow, d"
+
+          # Hyprshot
+          "$mod, Z, exec, hyprshot -m region"
+
+          # Media keys
+          ", XF86AudioPlay,        exec, playerctl play-pause"
+          ", XF86AudioMute,        exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
+          ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
+          ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+          ", XF86AudioNext,        exec, playerctl next"
+          ", XF86AudioPrev,        exec, playerctl previous"
+
+          ", XF86Calculator,       exec, speedcrunch"
+        ];
+
+        bindm = [
+          "$mod, mouse:272, movewindow"
+          "$mod, mouse:273, resizewindow"
         ];
       };
     };

systems/modules/users.nix

@@ -10,7 +10,7 @@
       home-manager
       legcord
       spotify
-      proton-vpn
+      protonvpn-gui
     ];
     shell = pkgs.zsh;
   };

systems/work/default.nix

@@ -24,7 +24,6 @@
       ../modules/enova.nix
       ../modules/devenv.nix
       ../modules/bitwarden.nix
-      ../modules/btop.nix
     ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;