commit 24ac226be590673e148657441092a7f4383149bc · ptr.pet/ark

+11 -3

hosts/chernobog/default.nix

···

       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"];

     

       73
       73
       +
             serif = [

     

       74
       74
       +
               "Comic Relief"

     

       75
       75
       +
               "Noto Serif"

     

       76
       76
       +
               "Source Han Serif"

     

       77
       77
       +
             ];

     

       78
       78
       +
             sansSerif = [

     

       79
       79
       +
               "Comic Relief"

     

       80
       80
       +
               "Noto Sans"

     

       81
       81
       +
               "Source Han Sans"

     

       82
       82
       +
             ];

     

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

     

       76
       84
        
           };

     

       77
       85
        
         };

     

       78
       86

+5 -3

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
       -
         }];

     

       3
       3
       +
         home-manager.sharedModules = [

     

       4
       4
       +
           {

     

       5
       5
       +
             services.udiskie.enable = true;

     

       6
       6
       +
           }

     

       7
       7
       +
         ];

     

       6
       8
        
       }

+1

hosts/chernobog/modules/boot.nix

···

       3
       3
        
           enable = true;

     

       4
       4
        
           editor = false;

     

       5
       5
        
           configurationLimit = 20;

     

       6
       6
       +
           consoleMode = "max";

     

       6
       7
        
         };

     

       7
       8
        
         boot.loader.efi.canTouchEfiVariables = true;

     

       8
       9
        
       }

+2

hosts/chernobog/modules/lact.nix/default.nix

···

       1
       1
        
       {

     

       2
       2
       +
         hardware.amdgpu.overdrive.enable = true;

     

       3
       3
       +
       

     

       2
       4
        
         services.lact.enable = true;

     

       3
       5
        
         environment.etc."lact/config.yaml".source = ./config.yaml;

     

       4
       6
        
       }

+1 -1

hosts/chernobog/modules/network.nix

···

       1
       1
        
       {

     

       2
       2
       -
         imports = [ ../../../modules/network/dns ];

     

       2
       2
       +
         imports = [ ../../../modules/network/dns/systemd.nix ];

     

       3
       3
        
       

     

       4
       4
        
         networking.useDHCP = true;

     

       5
       5
        
       }

+17

modules/network/dns/systemd.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         networking.nameservers = [

     

       3
       3
       +
           "1.1.1.1"

     

       4
       4
       +
           "1.0.0.1"

     

       5
       5
       +
         ];

     

       6
       6
       +
       

     

       7
       7
       +
         services.resolved = {

     

       8
       8
       +
           enable = true;

     

       9
       9
       +
           dnssec = "true";

     

       10
       10
       +
           domains = [ "~." ];

     

       11
       11
       +
           fallbackDns = [

     

       12
       12
       +
             "1.1.1.1"

     

       13
       13
       +
             "1.0.0.1"

     

       14
       14
       +
           ];

     

       15
       15
       +
           dnsovertls = "true";

     

       16
       16
       +
         };

     

       17
       17
       +
       }

+4 -1

modules/network/tailscale.nix

···

       1
       1
       +
       { lib, ... }:

     

       1
       2
        
       {

     

       2
       3
        
         services.tailscale = {

     

       3
       4
        
           enable = true;

     

       4
       5
        
           port = 41641;

     

       5
       6
        
           extraSetFlags = [ "--advertise-exit-node" ];

     

       6
       6
       -
           extraUpFlags = [ "--ssh" ];

     

       7
       7
       +
           # extraUpFlags = [ "--ssh" ];

     

       7
       8
        
           extraDaemonFlags = [ "--no-logs-no-support" ];

     

       8
       9
        
           useRoutingFeatures = "both";

     

       9
       10
        
           openFirewall = true;

     

       10
       11
        
         };

     

       12
       12
       +
       

     

       13
       13
       +
         networking.interfaces.tailscale0.useDHCP = lib.mkForce false;

     

       11
       14
        
       }

+9 -18

users/mayer/default.nix

···

       11
       11
        
         nixosConfig = globalAttrs.config;

     

       12
       12
        
       in

     

       13
       13
        
       {

     

       14
       14
       +
         imports = [ ./stylix.nix ];

     

       15
       15
       +
       

     

       14
       16
        
         users.users.mayer = {

     

       15
       17
        
           isNormalUser = true;

     

       16
       18
        
           createHome = true;

     
···

       51
       53
        
         security.polkit.enable = true;

     

       52
       54
        
       

     

       53
       55
        
         security.pam.loginLimits = [

     

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

     

       56
       56
       +
           {

     

       57
       57
       +
             domain = "@users";

     

       58
       58
       +
             item = "rtprio";

     

       59
       59
       +
             type = "-";

     

       60
       60
       +
             value = 1;

     

       61
       61
       +
           }

     

       55
       62
        
         ];

     

       56
       63
        
       

     

       57
       64
        
         home-manager.users.mayer =

     
···

       85
       92
        
                   ]

     

       86
       93
        
                   # dev stuff

     

       87
       94
        
                   [

     

       95
       95
       +
                     "zed"

     

       88
       96
        
                     "helix"

     

       89
       97
        
                     "git"

     

       90
       98
        
                     "ssh"

     
···

       97
       105
        
               in

     

       98
       106
        
               l.flatten [

     

       99
       107
        
                 (tlib.prefixStrings "${inputs.self}/users/modules/" modulesToEnable)

     

       100
       100
       -
                 ./stylix.nix

     

       101
       108
        
               ];

     

       102
       109
        
       

     

       103
       110
        
             home = {

     
···

       121
       128
        
             };

     

       122
       129
        
       

     

       123
       130
        
             fonts.fontconfig.enable = l.mkForce true;

     

       124
       124
       -
       

     

       125
       125
       -
             settings.iconTheme = {

     

       126
       126
       -
               name = "Yaru-dark";

     

       127
       127
       -
               package = pkgs.yaru-theme;

     

       128
       128
       -
             };

     

       129
       129
       -
       

     

       130
       130
       -
             home.pointerCursor = {

     

       131
       131
       -
               package = pkgs.bibata-cursors;

     

       132
       132
       -
               name = "Bibata-Modern-Classic";

     

       133
       133
       -
               size = 24;

     

       134
       134
       -
               gtk.enable = true;

     

       135
       135
       -
               x11.enable = true;

     

       136
       136
       -
             };

     

       137
       137
       -
             gtk.enable = true;

     

       138
       138
       -
             gtk.theme.package = pkgs.yaru-theme;

     

       139
       139
       -
             gtk.theme.name = "Yaru-dark";

     

       140
       131
        
       

     

       141
       132
        
             programs.git.includes = [

     

       142
       133
        
               {

+59

users/mayer/stylix.conf.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }:

     

       6
       6
       +
       {

     

       7
       7
       +
         stylix.enable = true;

     

       8
       8
       +
         stylix.autoEnable = false;

     

       9
       9
       +
       

     

       10
       10
       +
         stylix.targets = {

     

       11
       11
       +
           console.enable = true;

     

       12
       12
       +
           fontconfig.enable = true;

     

       13
       13
       +
           font-packages.enable = true;

     

       14
       14
       +
           qt.enable = true;

     

       15
       15
       +
           gnome.enable = true;

     

       16
       16
       +
           gtk.enable = true;

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         stylix.image = ./wallpaper.png;

     

       20
       20
       +
         stylix.polarity = "dark";

     

       21
       21
       +
         stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";

     

       22
       22
       +
       

     

       23
       23
       +
         stylix.cursor = {

     

       24
       24
       +
           package = pkgs.bibata-cursors;

     

       25
       25
       +
           name = "Bibata-Modern-Classic";

     

       26
       26
       +
           size = 24;

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         stylix.fonts = {

     

       30
       30
       +
           serif = {

     

       31
       31
       +
             name = "Comic Relief";

     

       32
       32
       +
             package = pkgs.comic-relief;

     

       33
       33
       +
           };

     

       34
       34
       +
           sansSerif = config.stylix.fonts.serif;

     

       35
       35
       +
           monospace = {

     

       36
       36
       +
             name = "Comic Mono";

     

       37
       37
       +
             package = pkgs.comic-mono;

     

       38
       38
       +
           };

     

       39
       39
       +
         };

     

       40
       40
       +
       

     

       41
       41
       +
         stylix.fonts.sizes = {

     

       42
       42
       +
           popups = 13;

     

       43
       43
       +
           terminal = 13;

     

       44
       44
       +
         };

     

       45
       45
       +
       

     

       46
       46
       +
         stylix.opacity = {

     

       47
       47
       +
           terminal = 0.7;

     

       48
       48
       +
           applications = 0.9;

     

       49
       49
       +
           desktop = 0.9;

     

       50
       50
       +
           popups = 0.9;

     

       51
       51
       +
         };

     

       52
       52
       +
       

     

       53
       53
       +
         stylix.icons = {

     

       54
       54
       +
           enable = true;

     

       55
       55
       +
           dark = "Yaru-dark";

     

       56
       56
       +
           light = "Yaru";

     

       57
       57
       +
           package = pkgs.yaru-theme;

     

       58
       58
       +
         };

     

       59
       59
       +
       }

+10

users/mayer/stylix.home.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         inputs,

     

       3
       3
       +
         ...

     

       4
       4
       +
       }:

     

       5
       5
       +
       {

     

       6
       6
       +
         imports = [

     

       7
       7
       +
           (import inputs.stylix).homeModules.stylix

     

       8
       8
       +
           ./stylix.conf.nix

     

       9
       9
       +
         ];

     

       10
       10
       +
       }

+4 -57

users/mayer/stylix.nix

···

       1
       1
        
       {

     

       2
       2
        
         inputs,

     

       3
       3
       -
         config,

     

       4
       4
       -
         pkgs,

     

       5
       5
       -
         terra,

     

       6
       6
       -
         lib,

     

       7
       3
        
         ...

     

       8
       4
        
       }:

     

       9
       5
        
       {

     

       10
       10
       -
         imports = [ (import inputs.stylix).homeModules.stylix ];

     

       11
       11
       -
       

     

       12
       12
       -
         stylix.image = ./wallpaper.png;

     

       13
       13
       -
         stylix.polarity = "dark";

     

       14
       14
       -
         stylix.base16Scheme =

     

       15
       15
       -
           let

     

       16
       16
       -
             night = "#2b292d";

     

       17
       17
       -
             ash = "#383539";

     

       18
       18
       -
             umber = "#4d424b";

     

       19
       19
       -
             bark = "#6F5D63";

     

       20
       20
       -
             mist = "#D1D1E0";

     

       21
       21
       -
             sage = "#B1B695";

     

       22
       22
       -
             blush = "#fecdb2";

     

       23
       23
       -
             coral = "#ffa07a";

     

       24
       24
       -
             rose = "#F6B6C9";

     

       25
       25
       -
             ember = "#e06b75";

     

       26
       26
       -
             honey = "#F5D76E";

     

       27
       27
       -
           in

     

       28
       28
       -
           {

     

       29
       29
       -
             base00 = night;

     

       30
       30
       -
             base01 = ash;

     

       31
       31
       -
             base02 = umber;

     

       32
       32
       -
             base03 = bark;

     

       33
       33
       -
             base04 = blush;

     

       34
       34
       -
             base05 = mist;

     

       35
       35
       -
             base06 = mist;

     

       36
       36
       -
             base07 = bark;

     

       37
       37
       -
             base08 = ember;

     

       38
       38
       -
             base09 = honey;

     

       39
       39
       -
             base0A = rose;

     

       40
       40
       -
             base0B = sage;

     

       41
       41
       -
             base0C = bark;

     

       42
       42
       -
             base0D = coral;

     

       43
       43
       -
             base0E = blush;

     

       44
       44
       -
             base0F = umber;

     

       45
       45
       -
           };

     

       46
       46
       -
       

     

       47
       47
       -
         stylix.fonts = {

     

       48
       48
       -
           serif = {

     

       49
       49
       -
             name = "Comic Relief";

     

       50
       50
       -
             package = pkgs.comic-relief;

     

       51
       51
       -
           };

     

       52
       52
       -
           sansSerif = config.stylix.fonts.serif;

     

       53
       53
       -
           monospace = {

     

       54
       54
       -
             name = "Comic Mono";

     

       55
       55
       -
             package = terra.comic-mono;

     

       56
       56
       -
           };

     

       57
       57
       -
         };

     

       58
       58
       -
       

     

       59
       59
       -
         stylix.fonts.sizes = {

     

       60
       60
       -
           popups = 13;

     

       61
       61
       -
           terminal = 13;

     

       62
       62
       -
         };

     

       6
       6
       +
         imports = [

     

       7
       7
       +
           (import inputs.stylix).nixosModules.stylix

     

       8
       8
       +
           ./stylix.conf.nix

     

       9
       9
       +
         ];

     

       63
       10
        
       }

users/mayer/wallpaper.png

This is a binary file and will not be displayed.

+5 -5

users/modules/foot/default.nix

···

       11
       11
        
           package = pkgs.foot;

     

       12
       12
        
           server.enable = true;

     

       13
       13
        
           settings = {

     

       14
       14
       -
             colors = {

     

       15
       15
       -
               alpha = 0.7;

     

       16
       16
       -
               background = "000000";

     

       17
       17
       -
             };

     

       14
       14
       +
             # colors = {

     

       15
       15
       +
             #   alpha = 0.7;

     

       16
       16
       +
             #   background = "000000";

     

       17
       17
       +
             # };

     

       18
       18
        
             main = {

     

       19
       19
        
               # login-shell = "yes";

     

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

     

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

     

       22
       21
        
             };

     

       23
       22
        
             csd = {

     

       24
       23
        
               preferred = "client";

     
···

       29
       28
        
             bell.system = "no";

     

       30
       29
        
           };

     

       31
       30
        
         };

     

       31
       31
       +
         stylix.targets.foot.enable = true;

     

       32
       32
        
       }

+1 -2

users/modules/helix/default.nix

···

       1
       1
        
       {

     

       2
       2
       -
         # stylix.targets.helix.enable = false;

     

       2
       2
       +
         stylix.targets.helix.enable = true;

     

       3
       3
        
         programs.helix = {

     

       4
       4
        
           enable = true;

     

       5
       5
        
           languages.language = [

     
···

       18
       18
        
             }

     

       19
       19
        
           ];

     

       20
       20
        
           settings = {

     

       21
       21
       -
             theme = "ferra";

     

       22
       21
        
             editor = {

     

       23
       22
        
               soft-wrap.enable = true;

     

       24
       23
        
               line-number = "relative";

+7 -3

users/modules/mako/default.nix

···

       1
       1
        
       { ... }:

     

       2
       2
        
       {

     

       3
       3
       -
         programs.mako = {

     

       3
       3
       +
         stylix.targets.mako.enable = true;

     

       4
       4
       +
         services.mako = {

     

       4
       5
        
           enable = true;

     

       5
       5
       -
           anchor = "top-center";

     

       6
       6
       -
           borderRadius = 16;

     

       6
       6
       +
           settings = {

     

       7
       7
       +
             anchor = "top-right";

     

       8
       8
       +
             border-radius = 2;

     

       9
       9
       +
             default-timeout = 4000;

     

       10
       10
       +
           };

     

       7
       11
        
         };

     

       8
       12
        
       }

+1

users/modules/nushell/default.nix

···

       2
       2
        
       {

     

       3
       3
        
         home.shell.enableNushellIntegration = true;

     

       4
       4
        
       

     

       5
       5
       +
         stylix.targets.nushell.enable = true;

     

       5
       6
        
         programs.carapace.enable = true;

     

       6
       7
        
         programs.nushell = {

     

       7
       8
        
           enable = true;

+4

users/modules/rofi/default.nix

···

       1
       1
        
       { pkgs, ... }:

     

       2
       2
        
       {

     

       3
       3
       +
         stylix.targets.rofi.enable = true;

     

       3
       4
        
         programs.rofi = {

     

       4
       5
        
           enable = true;

     

       6
       6
       +
           package = pkgs.rofi.overrideAttrs (old: rec {

     

       7
       7
       +
             buildInputs = builtins.filter (x: x.pname != "gdk-pixbuf") old.buildInputs;

     

       8
       8
       +
           });

     

       5
       9
        
         };

     

       6
       10
        
       }

-12

users/modules/settings/default.nix

···

       14
       14
        
             type = t.bool;

     

       15
       15
        
             default = true;

     

       16
       16
        
           };

     

       17
       17
       -
           settings.iconTheme = {

     

       18
       18
       -
             name = l.mkOption {

     

       19
       19
       -
               type = t.str;

     

       20
       20
       -
             };

     

       21
       21
       -
             package = l.mkOption {

     

       22
       22
       -
               type = t.package;

     

       23
       23
       -
             };

     

       24
       24
       -
           };

     

       25
       17
        
           settings.terminal = {

     

       26
       18
        
             name = l.mkOption {

     

       27
       19
        
               type = t.str;

     
···

       30
       22
        
               type = t.path;

     

       31
       23
        
             };

     

       32
       24
        
           };

     

       33
       33
       -
         };

     

       34
       34
       -
       

     

       35
       35
       -
         config = l.mkIf cfg.enable {

     

       36
       36
       -
           gtk.iconTheme = cfg.iconTheme;

     

       37
       25
        
         };

     

       38
       26
        
       }

+5 -4

users/modules/sway/default.nix

···

       11
       11
        
           ../wayland

     

       12
       12
        
           ../swaylock

     

       13
       13
        
           ../wlsunset

     

       14
       14
       -
           ../dunst

     

       14
       14
       +
           ../mako

     

       15
       15
        
           ../rofi

     

       16
       16
        
           # ./swayidle.nix

     

       17
       17
        
         ];

     

       18
       18
        
       

     

       19
       19
       +
         stylix.targets.sway.enable = true;

     

       19
       20
        
         wayland.windowManager = {

     

       20
       21
        
           sway =

     

       21
       22
        
             let

     
···

       27
       28
        
             {

     

       28
       29
        
               enable = true;

     

       29
       30
        
               wrapperFeatures.gtk = true;

     

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

     

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

     

       31
       32
        
               config = {

     

       32
       33
        
                 bars = [ ];

     

       33
       34
        
                 window = {

     
···

       94
       95
        
                   };

     

       95
       96
        
                 input = {

     

       96
       97
        
                   "13364:832:Keychron_Keychron_V4_Keyboard" = {

     

       97
       97
       -
                     xkb_layout = nixosConfig.services.xserver.layout;

     

       98
       98
       +
                     xkb_layout = nixosConfig.services.xserver.xkb.layout;

     

       98
       99
        
                   };

     

       99
       100
        
                   "1:1:AT_Translated_Set_2_keyboard" = {

     

       100
       101
        
                     xkb_layout = "tr";

     
···

       128
       129
        
               };

     

       129
       130
        
             };

     

       130
       131
        
         };

     

       131
       131
       -
       }
     

       132
       132
       +
       }

+1

users/modules/swaylock/default.nix

···

       1
       1
        
       { pkgs, ... }:

     

       2
       2
        
       {

     

       3
       3
       +
         stylix.targets.swaylock.enable = true;

     

       3
       4
        
         programs.swaylock = {

     

       4
       5
        
           package = pkgs.swaylock-effects;

     

       5
       6
        
           settings = {

+10

users/modules/zed/default.nix

···

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         stylix.targets.zed.enable = true;

     

       4
       4
       +
         programs.zed-editor = {

     

       5
       5
       +
           enable = true;

     

       6
       6
       +
           extensions = [ "nix" ];

     

       7
       7
       +
           extraPackages = with pkgs; [ nixd ];

     

       8
       8
       +
           installRemoteServer = true;

     

       9
       9
       +
         };

     

       10
       10
       +
       }