commit 3526e3956730ceca5eb8ea9357bbd639fe8e2848 · ptr.pet/ark

+19 -1

hosts/chernobog/default.nix

···

       22
       22
        
             ../../users/root

     

       23
       23
        
             ../../users/mayer

     

       24
       24
        
             ../../modules/base

     

       25
       25
       +
             ../../locale/default.nix

     

       25
       26
        
           ]

     

       26
       27
        
           ++ (tlib.importFolder (toString ./modules));

     

       27
       28
        
       

     
···

       55
       56
        
       

     

       56
       57
        
         fonts = {

     

       57
       58
        
           enableDefaultPackages = true;

     

       58
       58
       -
           packages = [ pkgs.dejavu_fonts ];

     

       59
       59
       +
           packages = with pkgs; [

     

       60
       60
       +
             noto-fonts

     

       61
       61
       +
             noto-fonts-cjk-serif

     

       62
       62
       +
             noto-fonts-cjk-sans

     

       63
       63
       +
             noto-fonts-emoji

     

       64
       64
       +
             font-awesome

     

       65
       65
       +
             source-han-serif

     

       66
       66
       +
             source-han-sans

     

       67
       67
       +
             source-han-sans-japanese

     

       68
       68
       +
             source-han-serif-japanese

     

       69
       69
       +
             comic-mono

     

       70
       70
       +
             comic-relief

     

       71
       71
       +
           ];

     

       72
       72
       +
           fontconfig.defaultFonts = {

     

       73
       73
       +
             serif = ["Comic Relief" "Noto Serif" "Source Han Serif"];

     

       74
       74
       +
             sansSerif = ["Comic Relief" "Noto Sans" "Source Han Sans"];

     

       75
       75
       +
             monospace = ["Comic Mono"];

     

       76
       76
       +
           };

     

       59
       77
        
         };

     

       60
       78
        
       

     

       61
       79
        
         services.earlyoom.enable = true;

+6

hosts/chernobog/modules/auto-mount.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         services.udisks2.enable = true;

     

       3
       3
       +
         home-manager.sharedModules = [{

     

       4
       4
       +
           services.udiskie.enable = true;

     

       5
       5
       +
         }];

     

       6
       6
       +
       }

+1 -1

modules/nushell/prompt.nu

···

       17
       17
        
       def create_left_prompt [] {

     

       18
       18
        
           let hostname = sys host | get hostname

     

       19
       19
        
           # str replace handles whoami output on windows

     

       20
       20
       -
           let username = ^whoami | str replace $"($hostname)\\" ""

     

       20
       20
       +
           let username = whoami | str replace $"($hostname)\\" ""

     

       21
       21
        
       

     

       22
       22
        
           let c = $host_colors | get $hostname

     

       23
       23
        
           let hostname_fmt = $hostname | ansi gradient --fgstart $c.start --fgend $c.end

+10

users/mayer/default.nix

···

       47
       47
        
           };

     

       48
       48
        
         };

     

       49
       49
        
       

     

       50
       50
       +
         services.gnome.gnome-keyring.enable = true;

     

       51
       51
       +
         security.polkit.enable = true;

     

       52
       52
       +
       

     

       53
       53
       +
         security.pam.loginLimits = [

     

       54
       54
       +
           { domain = "@users"; item = "rtprio"; type = "-"; value = 1; }

     

       55
       55
       +
         ];

     

       56
       56
       +
       

     

       50
       57
        
         home-manager.users.mayer =

     

       51
       58
        
           {

     

       52
       59
        
             config,

     
···

       65
       72
        
               let

     

       66
       73
        
                 modulesToEnable = l.flatten [

     

       67
       74
        
                   [

     

       75
       75
       +
                     "settings"

     

       76
       76
       +
                     "sway"

     

       68
       77
        
                     "wayland"

     

       69
       78
        
                     "foot"

     

       70
       79
        
                   ]

     
···

       82
       91
        
                   ]

     

       83
       92
        
                   [

     

       84
       93
        
                     "zen"

     

       94
       94
       +
                     "discord"

     

       85
       95
        
                   ]

     

       86
       96
        
                 ];

     

       87
       97
        
               in

users/mayer/wallpaper.png

This is a binary file and will not be displayed.

+7 -3

users/modules/foot/default.nix

···

       5
       5
        
       }:

     

       6
       6
        
       {

     

       7
       7
        
         settings.terminal.name = "foot";

     

       8
       8
       -
         settings.terminal.binary = "${pkgs.foot}/bin/foot";

     

       8
       8
       +
         settings.terminal.binary = "${pkgs.foot}/bin/footclient";

     

       9
       9
        
         programs.foot = {

     

       10
       10
        
           enable = true;

     

       11
       11
        
           package = pkgs.foot;

     

       12
       12
       -
           server.enable = false;

     

       12
       12
       +
           server.enable = true;

     

       13
       13
        
           settings = {

     

       14
       14
       +
             colors = {

     

       15
       15
       +
               alpha = 0.7;

     

       16
       16
       +
               background = "000000";

     

       17
       17
       +
             };

     

       14
       18
        
             main = {

     

       15
       15
       -
               login-shell = "yes";

     

       19
       19
       +
               # login-shell = "yes";

     

       16
       20
        
               dpi-aware = lib.mkForce "yes";

     

       17
       21
        
               font = "Comic Mono:size=12";

     

       18
       22
        
             };

+8 -1

users/modules/nushell/default.nix

···

       5
       5
        
         programs.carapace.enable = true;

     

       6
       6
        
         programs.nushell = {

     

       7
       7
        
           enable = true;

     

       8
       8
       -
           shellAliases = {myip = lib.mkForce "echo";};

     

       8
       8
       +
           shellAliases = lib.mapAttrs (_: lib.mkForce) {

     

       9
       9
       +
             myip = "echo";

     

       10
       10
       +
             l = "ls";

     

       11
       11
       +
             ls = "ls";

     

       12
       12
       +
             ll = "ls -l";

     

       13
       13
       +
             la = "ls -a";

     

       14
       14
       +
           };

     

       9
       15
        
           extraEnv = ''

     

       10
       16
        
             source-env ${./prompt.nu}

     

       11
       17
        
           '';

     

       12
       18
        
           extraConfig = ''

     

       13
       19
        
             source ${./aliases.nu}

     

       20
       20
       +
             $env.config.show_banner = false

     

       14
       21
        
           '';

     

       15
       22
        
         };

     

       16
       23
        
       }

-1

users/modules/rofi/default.nix

···

       2
       2
        
       {

     

       3
       3
        
         programs.rofi = {

     

       4
       4
        
           enable = true;

     

       5
       5
       -
           package = pkgs.rofi-wayland;

     

       6
       5
        
         };

     

       7
       6
        
       }

+11 -5

users/modules/sway/default.nix

···

       27
       27
        
             {

     

       28
       28
        
               enable = true;

     

       29
       29
        
               wrapperFeatures.gtk = true;

     

       30
       30
       +
               systemd.variables = ["--all"];

     

       30
       31
        
               config = {

     

       31
       32
        
                 bars = [ ];

     

       32
       32
       -
                 gaps.smartBorders = "on";

     

       33
       33
       +
                 window = {

     

       34
       34
       +
                   border = 0;

     

       35
       35
       +
                   titlebar = false;

     

       36
       36
       +
                 };

     

       33
       37
        
                 menu = mkRofiCmd [

     

       34
       38
        
                   "-show"

     

       35
       39
        
                   "drun"

     
···

       56
       60
        
                     shotFile = config.home.homeDirectory + "/shots/shot_$(date '+%Y_%m_%d_%H_%M')";

     

       57
       61
        
                     shotDir = config.home.homeDirectory + "/shots";

     

       58
       62
        
                   in

     

       59
       59
       -
                   lib.mkOptionDefault {

     

       63
       63
       +
                   {

     

       64
       64
       +
                     "${mod}+d" = "exec ${config.wayland.windowManager.sway.config.menu}";

     

       65
       65
       +
                     "${mod}+Return" = "exec ${config.wayland.windowManager.sway.config.terminal}";

     

       60
       66
        
                     "${mod}+Escape" = "exec ${wlogout} -p layer-shell";

     

       61
       67
        
                     "${mod}+q" = "kill";

     

       62
       68
        
                     "${mod}+Shift+e" = "exit";

     
···

       113
       119
        
                     adaptive_sync = "on";

     

       114
       120
        
                   };

     

       115
       121
        
                   "DP-1" = {

     

       116
       116
       -
                     mode = "1920x1080@165Hz";

     

       122
       122
       +
                     mode = "1920x1080@165.009Hz";

     

       117
       123
        
                   };

     

       118
       118
       -
                   "HDMI-A-1" = {

     

       124
       124
       +
                   "HDMI-A-2" = {

     

       119
       125
        
                     mode = "1920x1080@74.973Hz";

     

       120
       126
        
                   };

     

       121
       127
        
                 };

     

       122
       128
        
               };

     

       123
       129
        
             };

     

       124
       130
        
         };

     

       125
       125
       -
       }

     

       131
       131
       +
       }