commit 7e8d08f9a966899005ed3dd931cdd5e4b625571c · ovyerus.com/dotfiles

+1 -1

home/desktop/apps.nix

···

       31
       31
        
           alejandra

     

       32
       32
        
           audacity

     

       33
       33
        
           # betterbird

     

       34
       34
       -
           bitwarden-desktop

     

       34
       34
       +
           # bitwarden-desktop

     

       35
       35
        
           blender

     

       36
       36
        
           bottles

     

       37
       37
        
           bruno

+9 -1

home/desktop/default.nix

···

       4
       4
        
         inputs,

     

       5
       5
        
         ...

     

       6
       6
        
       }: {

     

       7
       7
       -
         imports = [./apps.nix ./xdg.nix ../common/cli.nix ../common/git.nix ../common/nixpkgs.nix ../common/shell];

     

       7
       7
       +
         imports = [

     

       8
       8
       +
           ./apps.nix

     

       9
       9
       +
           # ./niri.nix

     

       10
       10
       +
           ./xdg.nix

     

       11
       11
       +
           ../common/cli.nix

     

       12
       12
       +
           ../common/git.nix

     

       13
       13
       +
           ../common/nixpkgs.nix

     

       14
       14
       +
           ../common/shell

     

       15
       15
       +
         ];

     

       8
       16
        
       

     

       9
       17
        
         home.sessionVariables.DOCKER_HOST = "unix:///run/user/1000/podman/podman.sock";

     

       10
       18

+5 -4

home/desktop/niri.nix

···

       3
       3
        
         pkgs,

     

       4
       4
        
         ...

     

       5
       5
        
       }: {

     

       6
       6
       +
         # programs.niri.enable = true;

     

       6
       7
        
         programs.niri.package = pkgs.niri;

     

       7
       8
        
       

     

       8
       9
        
         programs.niri.settings = {

     
···

       27
       28
        
           prefer-no-csd = true;

     

       28
       29
        
       

     

       29
       30
        
           spawn-at-startup = [

     

       30
       30
       -
             {command = ["xwayland-satellite" ":1"];}

     

       31
       31
       -
             {command = ["hyprpaper"];}

     

       32
       32
       -
             {command = ["alacritty"];}

     

       31
       31
       +
             {command = ["xwayland-satellite" ":420"];}

     

       32
       32
       +
             # {command = ["hyprpaper"];}

     

       33
       33
       +
             {command = ["kitty"];}

     

       33
       34
        
           ];

     

       34
       35
        
       

     

       35
       36
        
           environment = {

     

       36
       36
       -
             DISPLAY = ":1";

     

       37
       37
       +
             DISPLAY = ":420";

     

       37
       38
        
             GDK_BACKEND = "wayland";

     

       38
       39
        
           };

     

       39
       40

+7 -20

nixos/wallsocket/configuration.nix

···

       6
       6
        
         imports = [

     

       7
       7
        
           ./bluetooth.nix

     

       8
       8
        
           ./graphics.nix

     

       9
       9
       +
           # ./niri.nix

     

       9
       10
        
           ./hardware-configuration.nix

     

       10
       11
        
           ../../modules/nixpkgs.nix

     

       11
       12
        
         ];

     
···

       40
       41
        
       

     

       41
       42
        
         # Enable the X11 windowing system.

     

       42
       43
        
         # You can disable this if you're only using the Wayland session.

     

       43
       43
       -
         services.xserver.enable = true;

     

       44
       44
       +
         # services.xserver.enable = true;

     

       44
       45
        
       

     

       45
       46
        
         # Enable the KDE Plasma Desktop Environment.

     

       46
       47
        
         services.displayManager.enable = true;

     
···

       49
       50
        
         services.displayManager.defaultSession = "plasma"; # Set to `plasma` for Wayland.

     

       50
       51
        
         services.desktopManager.plasma6.enable = true;

     

       51
       52
        
       

     

       52
       52
       -
         # programs.niri = {

     

       53
       53
       -
         #   enable = true;

     

       54
       54
       -
         #   package = pkgs.niri;

     

       55
       55
       -
         # };

     

       56
       56
       -
       

     

       57
       57
       -
         # services.greetd = {

     

       58
       58
       -
         #   enable = true;

     

       59
       59
       -
         #   settings = {

     

       60
       60
       -
         #     default_session = {

     

       61
       61
       -
         #       command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session -r --window-padding 4";

     

       62
       62
       -
         #       user = "greeter";

     

       63
       63
       -
         #     };

     

       64
       64
       -
         #   };

     

       65
       65
       -
         # };

     

       66
       66
       -
       

     

       67
       53
        
         # Configure keymap in X11

     

       68
       54
        
         services.xserver = {

     

       69
       55
        
           xkb.layout = "us";

     
···

       107
       93
        
       

     

       108
       94
        
         environment.sessionVariables."MOZ_ENABLE_WAYLAND" = 0;

     

       109
       95
        
         environment.systemPackages = with pkgs; [

     

       96
       96
       +
           amdgpu_top

     

       110
       97
        
           docker-compose

     

       111
       98
        
           ffmpeg_6-full

     

       112
       99
        
           git

     
···

       171
       158
        
       

     

       172
       159
        
         fonts = {

     

       173
       160
        
           packages = [

     

       174
       174
       -
           pkgs.ubuntu_font_family

     

       175
       175
       -
           pkgs.inter

     

       176
       176
       -
           inputs.iosevka-solai.packages.x86_64-linux.bin

     

       177
       177
       -
         ];

     

       161
       161
       +
             pkgs.ubuntu_font_family

     

       162
       162
       +
             pkgs.inter

     

       163
       163
       +
             inputs.iosevka-solai.packages.x86_64-linux.bin

     

       164
       164
       +
           ];

     

       178
       165
        
       

     

       179
       166
        
           fontDir.enable = true;

     

       180
       167
        
           enableDefaultPackages = true;

+31

nixos/wallsocket/niri.nix

···

       1
       1
       +
       {pkgs, ...}: {

     

       2
       2
       +
         # TODO: do i need this?

     

       3
       3
       +
         # security.pam.services.<WHAT>.kwallet.enable = true;

     

       4
       4
       +
       

     

       5
       5
       +
         programs.niri = {

     

       6
       6
       +
           enable = true;

     

       7
       7
       +
           package = pkgs.niri;

     

       8
       8
       +
         };

     

       9
       9
       +
       

     

       10
       10
       +
         # TODO: qtgreet? https://gitlab.com/marcusbritanicus/QtGreet

     

       11
       11
       +
         # services.greetd = {

     

       12
       12
       +
         #   enable = true;

     

       13
       13
       +
         #   settings = {

     

       14
       14
       +
         #     default_session = {

     

       15
       15
       +
         #       command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session -r --window-padding 4";

     

       16
       16
       +
         #       user = "greeter";

     

       17
       17
       +
         #     };

     

       18
       18
       +
         #   };

     

       19
       19
       +
         # };

     

       20
       20
       +
       

     

       21
       21
       +
         environment.systemPackages = with pkgs; [

     

       22
       22
       +
           wl-clipboard

     

       23
       23
       +
           wofi

     

       24
       24
       +
           swaylock

     

       25
       25
       +
           # swaynotificationcenter

     

       26
       26
       +
           fuzzel

     

       27
       27
       +
           xwayland-satellite

     

       28
       28
       +
           kdePackages.kwallet

     

       29
       29
       +
           kdePackages.kwalletmanager

     

       30
       30
       +
         ];

     

       31
       31
       +
       }