Merge branch 'zenix/cosmic' into nixbook/master

nixos/default.nix

@@ -98,44 +98,6 @@ in {
     sops
   ];
 
-  programs.tmux.enable = true;
-  programs.tmux.extraConfig = ''
-    set-option -sa terminal-overrides ",xterm*:Tc"
-
-    set escape-time 0
-
-    bind -n M-s split-window -v
-    bind -n M-v split-window -h
-    bind -n M-Enter split-window -h
-    bind -n M-h select-pane -L
-    bind -n M-j select-pane -D
-    bind -n M-k select-pane -U
-    bind -n M-l select-pane -R
-    bind -n M-q kill-pane
-    bind -n M-< resize-pane -L 10
-    bind -n M-> resize-pane -R 10
-    bind -n M-- resize-pane -D 10
-    bind -n M-+ resize-pane -U 10
-    bind -n M-z resize-pane -Z
-    bind -n M-u copy-mode
-    bind -n M-p paste-buffer
-    bind -n M-n next-window
-
-    set-window-option -g mode-keys vi
-    bind-key -T copy-mode-vi v send-keys -X begin-selection
-    bind-key -T copy-mode-vi y send-keys -X copy-selection
-
-    set -g mouse on
-
-    set -g base-index 1
-    set -g pane-base-index 1
-    set-window-option -g pane-base-index 1
-    set-option -g renumber-windows on
-
-    bind -n "M-`" break-pane -d
-    bind -n "M-`" break-pane -d
-  '';
-
   boot.kernel.sysctl = {
     "net.ipv4.ip_unprivileged_port_start" = 53;
   };

nixos/programs/hyprland.nix

@@ -0,0 +1,13 @@
+{config, ...}: {
+  programs.hyprland.enable = true;
+  security.pam.services.hyprlock = {};
+
+  imports = [
+    ./pipewire.nix
+    ../workstation.nix
+  ];
+
+  home-manager.users.${config.user}.imports = [
+    ../../home/desktop/hyprland/.
+  ];
+}

nixos/programs/pipewire.nix

@@ -0,0 +1,15 @@
+{
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+  # pipewire raop
+  networking.firewall.allowedUDPPorts = [6002 6001];
+  # network streaming
+  networking.firewall.allowedTCPPorts = [4713];
+}

nixos/workstation.nix

@@ -2,34 +2,13 @@
   inputs,
   pkgs,
   lib,
+  config,
   ...
 }: {
   imports = [
     inputs.stylix.nixosModules.stylix
   ];
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-27.3.11"
-  ];
 
-  programs.hyprland.enable = true;
-
-  # use pipewire
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
-  # pipewire raop
-  networking.firewall.allowedUDPPorts = [6002 6001];
-  # network streaming
-  networking.firewall.allowedTCPPorts = [4713];
-
-  security.pam.services.swaylock = {};
-  security.pam.services.hyprlock = {};
   security.polkit.enable = true;
   systemd.user.services.polkit-gnome-authentication-agent-1 = {
     description = "polkit-gnome-authentication-agent-1";
@@ -92,4 +71,8 @@
     nerdfonts
     interalia
   ];
+
+  home-manager.users.${config.user}.imports = [
+    ../home/workstation.nix
+  ];
 }