commit 73f93fd0ab0f0178a58118ea41da486ad37c5e7f · pyrox.dev/nix

+1 -1

modules/home/profiles/cli/default.nix

···

       23
       23
        
             };

     

       24
       24
        
             gpg.enable = mkDefault true;

     

       25
       25
        
             helix.enable = mkDefault true;

     

       26
       26
       -
             nix-index = mkDefault true;

     

       26
       26
       +
             nix-index.enable = mkDefault true;

     

       27
       27
        
             nushell.enable = mkDefault true;

     

       28
       28
        
             pandoc.enable = mkDefault true;

     

       29
       29
        
             ssh.enable = mkDefault true;

+2

modules/home/profiles/gui/default.nix

···

       26
       26
        
             };

     

       27
       27
        
             services = {

     

       28
       28
        
               gpg-agent.enable = mkDefault true;

     

       29
       29
       +
               kdeconnect.enable = mkDefault true;

     

       29
       30
        
               mako.enable = mkDefault true;

     

       31
       31
       +
               swayidle.enable = mkDefault true;

     

       30
       32
        
               syncthing.enable = mkDefault true;

     

       31
       33
        
             };

     

       32
       34
        
           };

+1 -1

modules/home/programs/misc-programs/default.nix

···

       44
       44
        
               enableFishIntegration = true;

     

       45
       45
        
               enableZshIntegration = true;

     

       46
       46
        
             };

     

       47
       47
       -
             obs = mkIf cfg.obs.enable {

     

       47
       47
       +
             obs-studio = mkIf cfg.obs.enable {

     

       48
       48
        
               enable = true;

     

       49
       49
        
               plugins = with pkgs.obs-studio-plugins; [

     

       50
       50
        
                 obs-ndi

+5 -3

modules/home/programs/neovim/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         pkgs,

     

       3
       3
       -
         osConfig,

     

       4
       3
        
         config,

     

       5
       4
        
         lib,

     

       6
       5
        
         ...

     
···

       13
       12
        
       

     

       14
       13
        
         config.programs.neovim = lib.mkIf cfg.enable {

     

       15
       14
        
           enable = true;

     

       16
       16
       -
           package = osConfig.programs.neovim.finalPackage;

     

       15
       15
       +
           package = pkgs.py.nvim;

     

       17
       16
        
           viAlias = true;

     

       18
       17
        
           vimAlias = true;

     

       19
       18
        
           vimdiffAlias = true;

     

       19
       19
       +
           withRuby = false;

     

       20
       20
       +
           withNodeJs = false;

     

       21
       21
       +
           withPython3 = false;

     

       20
       22
        
           extraPackages =

     

       21
       23
        
             [

     

       22
       24
        
               pkgs.bottom

     
···

       26
       28
        
               pkgs.nodejs

     

       27
       29
        
             ]

     

       28
       30
        
             ++ (

     

       29
       29
       -
               if config.py.profiles.graphical.enable then

     

       31
       31
       +
               if config.py.profiles.gui.enable then

     

       30
       32
        
                 [

     

       31
       33
        
                   pkgs.ffmpegthumbnailer

     

       32
       34
        
                   pkgs.fontpreview

+1 -1

modules/home/programs/ssh/default.nix

···

       4
       4
        
       in

     

       5
       5
        
       {

     

       6
       6
        
         options.py.programs.ssh.enable = lib.mkEnableOption "ssh";

     

       7
       7
       -
         config = lib.mkEnableOption cfg.enable {

     

       7
       7
       +
         config = lib.mkIf cfg.enable {

     

       8
       8
        
           programs.ssh = {

     

       9
       9
        
             enable = true;

     

       10
       10
        
             compression = true;

+2 -2

modules/home/programs/wlogout/default.nix

···

       5
       5
        
         ...

     

       6
       6
        
       }:

     

       7
       7
        
       let

     

       8
       8
       -
         cfg = config.programs.py.wlogout;

     

       8
       8
       +
         cfg = config.py.programs.wlogout;

     

       9
       9
        
         pkg = config.programs.wlogout.package;

     

       10
       10
        
       in

     

       11
       11
        
       {

     

       12
       12
        
         options.py.programs.wlogout.enable = lib.mkEnableOption "wlogout";

     

       13
       13
        
         config.programs.wlogout = lib.mkIf cfg.enable {

     

       14
       14
        
           enable = true;

     

       15
       15
       -
           style = import ./style.nix pkg;

     

       15
       15
       +
           style = import ./style.nix { inherit pkg; };

     

       16
       16
        
           layout = [

     

       17
       17
        
             {

     

       18
       18
        
               label = "hibernate";

+1 -1

modules/home/programs/wlogout/style.nix

···

       1
       1
       -
       { pkg }:

     

       1
       1
       +
       { pkg, ... }:

     

       2
       2
        
       let

     

       3
       3
        
         icon-path = "${pkg}/share/wlogout/icons";

     

       4
       4
        
       in

+1 -1

modules/home/scripts/default.nix

···

       1
       1
        
       { lib, config, ... }:

     

       2
       2
        
       {

     

       3
       3
        
         home.activation = {

     

       4
       4
       -
           removeLocalFonts = lib.hm.dag.entryAfter [ "writeBoundary" ] ''

     

       4
       4
       +
           removeLocalFonts = config.lib.dag.entryAfter [ "writeBoundary" ] ''

     

       5
       5
        
             unlink ${config.home.homeDirectory}/.local/share/fonts

     

       6
       6
        
           '';

     

       7
       7
        
         };

+33 -31

modules/home/wayland/keybindings.nix

···

       10
       10
        
         cfg = config.py.gui;

     

       11
       11
        
       in

     

       12
       12
        
       {

     

       13
       13
       -
         config.wayland.windowManager.sway.config.keybindings = lib.mkOptionDefault lib.mkIf cfg.enable {

     

       14
       14
       -
           "${mod}+d" = "${menu}";

     

       15
       15
       -
           "${mod}+Shift+F" = "exec MOZ_DISABLE_RDD_SANDBOX=1 firefox";

     

       16
       16
       -
           "${mod}+Return" = "exec ${term}";

     

       17
       17
       -
           # "${mod}+Shift+Return" = "exec ${pkgs.wezterm}/bin/wezterm";

     

       18
       18
       -
           "${mod}+x" = "exec wlogout";

     

       19
       19
       -
           "${mod}+s" = null;

     

       20
       20
       -
           "${mod}+w" = null;

     

       21
       21
       -
           "XF86MonBrightnessDown" = "exec brightnessctl set 5%-";

     

       22
       22
       -
           "XF86MonBrightnessUp" = "exec brightnessctl set +5%";

     

       23
       23
       -
           "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";

     

       24
       24
       -
           "XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";

     

       25
       25
       -
           "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";

     

       26
       26
       -
           "XF86AudioMicMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";

     

       27
       27
       -
           "XF86AudioPlay" = "exec playerctl play-pause";

     

       28
       28
       -
           "XF86AudioNext" = "exec playerctl next";

     

       29
       29
       -
           "XF86AudioPrev" = "exec playerctl previous";

     

       30
       30
       -
           "Shift+F3" = "exec ${grim} ${slurp-screen} | ${satty}";

     

       31
       31
       -
           "Shift+F4" = "exec ${grim} ${slurp-box} | ${satty}";

     

       32
       32
       -
           "${mod}+Shift+1" = "move container to workspace number 1";

     

       33
       33
       -
           "${mod}+Shift+2" = "move container to workspace number 2";

     

       34
       34
       -
           "${mod}+Shift+3" = "move container to workspace number 3";

     

       35
       35
       -
           "${mod}+Shift+4" = "move container to workspace number 4";

     

       36
       36
       -
           "${mod}+Shift+5" = "move container to workspace number 5";

     

       37
       37
       -
           "${mod}+Shift+6" = "move container to workspace number 6";

     

       38
       38
       -
           "${mod}+Shift+7" = "move container to workspace number 7";

     

       39
       39
       -
           "${mod}+Shift+8" = "move container to workspace number 8";

     

       40
       40
       -
           "${mod}+Shift+9" = "move container to workspace number 9";

     

       41
       41
       -
           "${mod}+Shift+0" = "move container to workspace number 10";

     

       42
       42
       -
           "${mod}+0" = "workspace number 10";

     

       43
       43
       -
         };

     

       13
       13
       +
         config.wayland.windowManager.sway.config.keybindings = lib.mkIf cfg.enable (

     

       14
       14
       +
           lib.mkOptionDefault {

     

       15
       15
       +
             "${mod}+d" = "${menu}";

     

       16
       16
       +
             "${mod}+Shift+F" = "exec MOZ_DISABLE_RDD_SANDBOX=1 firefox";

     

       17
       17
       +
             "${mod}+Return" = "exec ${term}";

     

       18
       18
       +
             # "${mod}+Shift+Return" = "exec ${pkgs.wezterm}/bin/wezterm";

     

       19
       19
       +
             "${mod}+x" = "exec wlogout";

     

       20
       20
       +
             "${mod}+s" = null;

     

       21
       21
       +
             "${mod}+w" = null;

     

       22
       22
       +
             "XF86MonBrightnessDown" = "exec brightnessctl set 5%-";

     

       23
       23
       +
             "XF86MonBrightnessUp" = "exec brightnessctl set +5%";

     

       24
       24
       +
             "XF86AudioRaiseVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ +5%";

     

       25
       25
       +
             "XF86AudioLowerVolume" = "exec pactl set-sink-volume @DEFAULT_SINK@ -5%";

     

       26
       26
       +
             "XF86AudioMute" = "exec pactl set-sink-mute @DEFAULT_SINK@ toggle";

     

       27
       27
       +
             "XF86AudioMicMute" = "exec pactl set-source-mute @DEFAULT_SOURCE@ toggle";

     

       28
       28
       +
             "XF86AudioPlay" = "exec playerctl play-pause";

     

       29
       29
       +
             "XF86AudioNext" = "exec playerctl next";

     

       30
       30
       +
             "XF86AudioPrev" = "exec playerctl previous";

     

       31
       31
       +
             "Shift+F3" = "exec ${grim} ${slurp-screen} | ${satty}";

     

       32
       32
       +
             "Shift+F4" = "exec ${grim} ${slurp-box} | ${satty}";

     

       33
       33
       +
             "${mod}+Shift+1" = "move container to workspace number 1";

     

       34
       34
       +
             "${mod}+Shift+2" = "move container to workspace number 2";

     

       35
       35
       +
             "${mod}+Shift+3" = "move container to workspace number 3";

     

       36
       36
       +
             "${mod}+Shift+4" = "move container to workspace number 4";

     

       37
       37
       +
             "${mod}+Shift+5" = "move container to workspace number 5";

     

       38
       38
       +
             "${mod}+Shift+6" = "move container to workspace number 6";

     

       39
       39
       +
             "${mod}+Shift+7" = "move container to workspace number 7";

     

       40
       40
       +
             "${mod}+Shift+8" = "move container to workspace number 8";

     

       41
       41
       +
             "${mod}+Shift+9" = "move container to workspace number 9";

     

       42
       42
       +
             "${mod}+Shift+0" = "move container to workspace number 10";

     

       43
       43
       +
             "${mod}+0" = "workspace number 10";

     

       44
       44
       +
           }

     

       45
       45
       +
         );

     

       44
       46
        
       }