added steam to omen

modules/features/niri.nix

@@ -31,12 +31,14 @@
 
           binds = {
             "Mod+Return".spawn-sh = lib.getExe terminalPkg;
-            "Mod+Ctrl+Return".spawn-sh = "${lib.getExe noctaliaPkg} ipc call launcher toggle";
+            # "Mod+Ctrl+Return".spawn-sh = "${lib.getExe noctaliaPkg} ipc call launcher toggle";
+            "Mod+Space".spawn-sh = "${lib.getExe noctaliaPkg} ipc call launcher toggle";
             "Mod+B".spawn-sh = "${lib.getExe pkgs.brave}";
             "Mod+E".spawn-sh = "xdg-open .";
             "Mod+Alt+L".spawn-sh = "loginctl lock-session";
 
-            "Mod+Q".close-window = { };
+            "Alt+F4".spawn-sh = "${lib.getExe' pkgs.coreutils "true"}";
+            "Mod+Shift+Q".close-window = { };
             "Mod+S".spawn-sh = "${lib.getExe noctaliaPkg} ipc call launcher toggle";
 
             "Mod+1".focus-workspace = 1;
@@ -51,11 +53,13 @@
 
             "Mod+Tab".focus-workspace-previous = { };
 
-            "Mod+WheelScrollDown".focus-workspace-down = { };
+            # "Mod+WheelScrollDown".focus-workspace-down = { };
-            "Mod+WheelScrollUp".focus-workspace-up = { };
+            # "Mod+WheelScrollUp".focus-workspace-up = { };
 
-            "Mod+Up".focus-window-up = { };
+            # "Mod+Up".focus-window-up = { };
-            "Mod+Down".focus-window-down = { };
+            # "Mod+Down".focus-window-down = { };
+            "Mod+Up".focus-workspace-up = { };
+            "Mod+Down".focus-workspace-down = { };
             "Mod+Left".focus-column-left = { };
             "Mod+Right".focus-column-right = { };
             "Mod+K".focus-window-up = { };
@@ -65,20 +69,20 @@
             "Mod+Home".focus-column-first = { };
             "Mod+End".focus-column-last = { };
 
-            "Mod+Shift+Left".focus-monitor-left = { };
+            # "Mod+Shift+Left".focus-monitor-left = { };
-            "Mod+Shift+Right".focus-monitor-right = { };
+            # "Mod+Shift+Right".focus-monitor-right = { };
-            "Mod+Shift+Up".focus-monitor-up = { };
+            # "Mod+Shift+Up".focus-monitor-up = { };
-            "Mod+Shift+Down".focus-monitor-down = { };
+            # "Mod+Shift+Down".focus-monitor-down = { };
 
-            "Mod+Ctrl+1".move-column-to-workspace = 1;
+            "Mod+Shift+1".move-column-to-workspace = 1;
-            "Mod+Ctrl+2".move-column-to-workspace = 2;
+            "Mod+Shift+2".move-column-to-workspace = 2;
-            "Mod+Ctrl+3".move-column-to-workspace = 3;
+            "Mod+Shift+3".move-column-to-workspace = 3;
-            "Mod+Ctrl+4".move-column-to-workspace = 4;
+            "Mod+Shift+4".move-column-to-workspace = 4;
-            "Mod+Ctrl+5".move-column-to-workspace = 5;
+            "Mod+Shift+5".move-column-to-workspace = 5;
-            "Mod+Ctrl+6".move-column-to-workspace = 6;
+            "Mod+Shift+6".move-column-to-workspace = 6;
-            "Mod+Ctrl+7".move-column-to-workspace = 7;
+            "Mod+Shift+7".move-column-to-workspace = 7;
-            "Mod+Ctrl+8".move-column-to-workspace = 8;
+            "Mod+Shift+8".move-column-to-workspace = 8;
-            "Mod+Ctrl+9".move-column-to-workspace = 9;
+            "Mod+Shift+9".move-column-to-workspace = 9;
 
             "Mod+Ctrl+Up".move-window-up = { };
             "Mod+Ctrl+Down".move-window-down = { };
@@ -124,8 +128,8 @@
             "Mod+Ctrl+WheelScrollLeft".move-column-left = { };
             "Mod+Shift+WheelScrollDown".focus-column-right = { };
             "Mod+Shift+WheelScrollUp".focus-column-left = { };
-            "Mod+Ctrl+Shift+WheelScrollDown".move-column-right = { };
+            # "Mod+Ctrl+Shift+WheelScrollDown".move-column-right = { };
-            "Mod+Ctrl+Shift+WheelScrollUp".move-column-left = { };
+            # "Mod+Ctrl+Shift+WheelScrollUp".move-column-left = { };
           };
         };
       };

modules/features/nixos-base.nix

@@ -38,5 +38,21 @@
     networking.networkmanager.enable = true;
 
     services.openssh.enable = true;
+
+    security.polkit.enable = true; # polkit
+    services.gnome.gnome-keyring.enable = true; # secret service
+    security.pam.services.swaylock = {};
+
+    # Enable sound with pipewire.
+    services.pulseaudio.enable = false;
+    security.rtkit.enable = true; # PulseAudio server uses this to acquire realtime priority.
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      # If you want to use JACK applications, uncomment this
+      #jack.enable = true;
+    };
   };
 }

modules/hosts/john-p14s/configuration.nix

@@ -11,6 +11,7 @@
       imports = [
         self.modules.nixos.base
         self.modules.nixos.p14sHardware
+        self.modules.nixos.onepassword
       ];
 
       rebuild.flakeDir = flakeDir;
@@ -32,15 +33,6 @@
       security.pam.services.swaylock = {};
       security.pam.services.swaylock.fprintAuth = true;
 
-      programs._1password.enable = true;
-      programs._1password-gui = {
-        enable = true;
-        # Certain features, including CLI integration and system authentication support,
-        # require enabling PolKit integration on some desktop environments (e.g. Plasma).
-        polkitPolicyOwners = [ "john" ];
-        # TODO this should not be a hardcoded username
-      };
-
       # This value determines the NixOS release from which the default
       # settings for stateful data, like file locations and database versions
       # on your system were taken. It's perfectly fine and recommended to leave
@@ -52,22 +44,6 @@
       services.libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
       services.fprintd.enable = true; # Enables fingerprint sensor
 
-      # Enable sound with pipewire.
-      services.pulseaudio.enable = false;
-      security.rtkit.enable = true; # PulseAudio server uses this to acquire realtime priority.
-      services.pipewire = {
-        enable = true;
-        alsa.enable = true;
-        alsa.support32Bit = true;
-        pulse.enable = true;
-        # If you want to use JACK applications, uncomment this
-        #jack.enable = true;
-
-        # use the example session manager (no others are packaged yet so this is enabled by default,
-        # no need to redefine it in your config for now)
-        # media-session.enable = true;
-      };
-
       home-manager.users.root = {
         imports = with inputs.self.modules.homeManager; [
           rebuild

modules/hosts/omen-nixos/configuration.nix

@@ -7,6 +7,8 @@
       self.modules.nixos.base
       self.modules.nixos.greetd
       self.modules.nixos.niri
+      self.modules.nixos.onepassword
+      self.modules.nixos.steam
     ];
 
     # Use the systemd-boot EFI boot loader.
@@ -112,6 +114,9 @@
     home-manager.users.john.imports = with inputs.self.modules.homeManager; [
       desktop
       # rebuild
+      {
+        my-vscode.enable = true;
+      }
     ];
   };
 

modules/programs/onepassword.nix

@@ -1,4 +1,15 @@
 { self, inputs, ... }: {
+  flake.modules.nixos.onepassword = { config, ... }: {
+    programs._1password.enable = true;
+    programs._1password-gui = {
+      enable = true;
+      # Certain features, including CLI integration and system authentication support,
+      # require enabling PolKit integration on some desktop environments (e.g. Plasma).
+      polkitPolicyOwners = [ "john" ];
+      # TODO this should not be a hardcoded username
+    };
+  };
+
   flake.modules.homeManager.onepassword = { config, ... }: {
     home.file.".config/1Password/ssh/agent.toml".text = ''
       # https://developer.1password.com/docs/ssh/agent/config