commit 9e3e04422ac7d94ca2253787f7e8aec80dce3c73 · ptr.pet/ark

+61 -6

flake.lock

···

       441
       441
        
               "type": "github"

     

       442
       442
        
             }

     

       443
       443
        
           },

     

       444
       444
       +
           "flake-compat_4": {

     

       445
       445
       +
             "flake": false,

     

       446
       446
       +
             "locked": {

     

       447
       447
       +
               "lastModified": 1673956053,

     

       448
       448
       +
               "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",

     

       449
       449
       +
               "owner": "edolstra",

     

       450
       450
       +
               "repo": "flake-compat",

     

       451
       451
       +
               "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",

     

       452
       452
       +
               "type": "github"

     

       453
       453
       +
             },

     

       454
       454
       +
             "original": {

     

       455
       455
       +
               "owner": "edolstra",

     

       456
       456
       +
               "repo": "flake-compat",

     

       457
       457
       +
               "type": "github"

     

       458
       458
       +
             }

     

       459
       459
       +
           },

     

       444
       460
        
           "flake-utils": {

     

       445
       461
        
             "locked": {

     

       446
       462
        
               "lastModified": 1678901627,

     
···

       478
       494
        
               "owner": "numtide",

     

       479
       495
        
               "repo": "flake-utils",

     

       480
       496
        
               "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",

     

       497
       497
       +
               "type": "github"

     

       498
       498
       +
             },

     

       499
       499
       +
             "original": {

     

       500
       500
       +
               "owner": "numtide",

     

       501
       501
       +
               "repo": "flake-utils",

     

       502
       502
       +
               "type": "github"

     

       503
       503
       +
             }

     

       504
       504
       +
           },

     

       505
       505
       +
           "flake-utils_4": {

     

       506
       506
       +
             "locked": {

     

       507
       507
       +
               "lastModified": 1667395993,

     

       508
       508
       +
               "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",

     

       509
       509
       +
               "owner": "numtide",

     

       510
       510
       +
               "repo": "flake-utils",

     

       511
       511
       +
               "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",

     

       481
       512
        
               "type": "github"

     

       482
       513
        
             },

     

       483
       514
        
             "original": {

     
···

       907
       938
        
               "nixpkgs": "nixpkgs_3",

     

       908
       939
        
               "nixpkgs-wayland": "nixpkgs-wayland",

     

       909
       940
        
               "nur": "nur",

     

       910
       910
       -
               "stylix": "stylix"

     

       941
       941
       +
               "stylix": "stylix",

     

       942
       942
       +
               "vscode-extensions": "vscode-extensions"

     

       911
       943
        
             }

     

       912
       944
        
           },

     

       913
       945
        
           "rust-analyzer-src": {

     
···

       1029
       1061
        
               ]

     

       1030
       1062
        
             },

     

       1031
       1063
        
             "locked": {

     

       1032
       1032
       -
               "lastModified": 1680432579,

     

       1033
       1033
       -
               "narHash": "sha256-sIcl3DvrDdQZM5kBWY25ocxJsIQFPV4gm54l79ZysB0=",

     

       1034
       1034
       -
               "owner": "danth",

     

       1064
       1064
       +
               "lastModified": 1681281620,

     

       1065
       1065
       +
               "narHash": "sha256-SjX38nDKBrlQN0CbbUgHHYshlfewrjgQ4p0nKL4W4YI=",

     

       1066
       1066
       +
               "owner": "yusdacra",

     

       1035
       1067
        
               "repo": "stylix",

     

       1036
       1036
       -
               "rev": "4205a141bfcc0b9d1c04932ec7fdf0f86f99aaf6",

     

       1068
       1068
       +
               "rev": "e53b29d8e850bd7ee3012f5e4c7c0a1ded533a91",

     

       1037
       1069
        
               "type": "github"

     

       1038
       1070
        
             },

     

       1039
       1071
        
             "original": {

     

       1040
       1040
       -
               "owner": "danth",

     

       1072
       1072
       +
               "owner": "yusdacra",

     

       1073
       1073
       +
               "ref": "fixed",

     

       1041
       1074
        
               "repo": "stylix",

     

       1042
       1075
        
               "type": "github"

     

       1043
       1076
        
             }

     
···

       1054
       1087
        
             "original": {

     

       1055
       1088
        
               "owner": "numtide",

     

       1056
       1089
        
               "repo": "flake-utils",

     

       1090
       1090
       +
               "type": "github"

     

       1091
       1091
       +
             }

     

       1092
       1092
       +
           },

     

       1093
       1093
       +
           "vscode-extensions": {

     

       1094
       1094
       +
             "inputs": {

     

       1095
       1095
       +
               "flake-compat": "flake-compat_4",

     

       1096
       1096
       +
               "flake-utils": "flake-utils_4",

     

       1097
       1097
       +
               "nixpkgs": [

     

       1098
       1098
       +
                 "nixpkgs"

     

       1099
       1099
       +
               ]

     

       1100
       1100
       +
             },

     

       1101
       1101
       +
             "locked": {

     

       1102
       1102
       +
               "lastModified": 1681693872,

     

       1103
       1103
       +
               "narHash": "sha256-gEy7sfcRiJypI0irVBWZ1xxyc+4MZPb5RqcC8krQi9s=",

     

       1104
       1104
       +
               "owner": "nix-community",

     

       1105
       1105
       +
               "repo": "nix-vscode-extensions",

     

       1106
       1106
       +
               "rev": "1c784113bfb7f0f0d82b32832fdf739f083e8d3a",

     

       1107
       1107
       +
               "type": "github"

     

       1108
       1108
       +
             },

     

       1109
       1109
       +
             "original": {

     

       1110
       1110
       +
               "owner": "nix-community",

     

       1111
       1111
       +
               "repo": "nix-vscode-extensions",

     

       1057
       1112
        
               "type": "github"

     

       1058
       1113
        
             }

     

       1059
       1114
        
           }

+4 -1

flake.nix

···

       34
       34
        
           nil.url = "github:oxalica/nil";

     

       35
       35
        
           nil.inputs.nixpkgs.follows = "nixpkgs";

     

       36
       36
        
       

     

       37
       37
       -
           stylix.url = "github:danth/stylix";

     

       37
       37
       +
           stylix.url = "github:yusdacra/stylix/fixed";

     

       38
       38
        
           stylix.inputs.nixpkgs.follows = "nixpkgs";

     

       39
       39
        
           stylix.inputs.home-manager.follows = "home";

     

       40
       40
       +
       

     

       41
       41
       +
           vscode-extensions.url = "github:nix-community/nix-vscode-extensions";

     

       42
       42
       +
           vscode-extensions.inputs.nixpkgs.follows = "nixpkgs";

     

       40
       43
        
       

     

       41
       44
        
           # needed for hyprland setup

     

       42
       45
        
           # hyprland.url = "github:hyprwm/Hyprland";

hosts/tkaronto/default.nix

···

       113
       113
        
           };

     

       114
       114
        
         };

     

       115
       115
        
       

     

       116
       116
       +
         networking.firewall.allowedUDPPorts = [49152];

     

       117
       117
       +
       

     

       116
       118
        
         # for tailscale

     

       117
       119
        
         networking.firewall.checkReversePath = "loose";

     

       118
       120
        
         services.tailscale.enable = true;

+34

users/modules/code/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         inputs,

     

       4
       4
       +
         ...

     

       5
       5
       +
       }: {

     

       6
       6
       +
         # stylix.targets.vscode.enable = false;

     

       7
       7
       +
         programs.vscode = {

     

       8
       8
       +
           enable = true;

     

       9
       9
       +
           package = pkgs.vscodium;

     

       10
       10
       +
           extensions = with inputs.vscode-extensions.extensions.x86_64-linux.vscode-marketplace; [

     

       11
       11
       +
             mkhl.direnv

     

       12
       12
       +
             bbenoist.nix

     

       13
       13
       +
             svelte.svelte-vscode

     

       14
       14
       +
             bradlc.vscode-tailwindcss

     

       15
       15
       +
             (rust-lang.rust-analyzer.overrideAttrs (old: {

     

       16
       16
       +
               src = old.src.overrideAttrs (old: {

     

       17
       17
       +
                 outputHash = "sha256-k9eDTY9y2ejg4jTApji8X6UmKYK/eCLMZJbiYuoTuyY=";

     

       18
       18
       +
               });

     

       19
       19
       +
             }))

     

       20
       20
       +
             # explodingcamera."1am"

     

       21
       21
       +
           ];

     

       22
       22
       +
           userSettings = {

     

       23
       23
       +
             "files.associations" = {

     

       24
       24
       +
               "*.css" = "tailwindcss";

     

       25
       25
       +
             };

     

       26
       26
       +
             "editor.quickSuggestions" = {

     

       27
       27
       +
               "strings" = "on";

     

       28
       28
       +
             };

     

       29
       29
       +
             "editor.suggest.showStatusBar" = true;

     

       30
       30
       +
             "editor.formatOnSave" = true;

     

       31
       31
       +
             # "workbench.colorTheme" = "1am";

     

       32
       32
       +
           };

     

       33
       33
       +
         };

     

       34
       34
       +
       }

+3 -1

users/modules/helix/default.nix

···

       3
       3
        
         pkgs,

     

       4
       4
        
         ...

     

       5
       5
        
       }: {

     

       6
       6
       +
         stylix.targets.helix.enable = false;

     

       6
       7
        
         programs.helix = {

     

       7
       8
        
           enable = true;

     

       8
       9
        
           languages = [

     
···

       17
       18
        
             }

     

       18
       19
        
           ];

     

       19
       20
        
           settings = {

     

       21
       21
       +
             theme = "ferra";

     

       20
       22
        
             editor = {

     

       21
       23
        
               soft-wrap.enable = true;

     

       22
       24
        
               line-number = "relative";

     
···

       26
       28
        
               cursor-shape.insert = "block";

     

       27
       29
        
               lsp = {

     

       28
       30
        
                 display-messages = true;

     

       29
       29
       -
                 display-inlay-hints = true;

     

       31
       31
       +
                 display-inlay-hints = false;

     

       30
       32
        
               };

     

       31
       33
        
               indent-guides = {

     

       32
       34
        
                 render = true;

+1 -1

users/patriot/default.nix

···

       111
       111
        
               # cli stuff

     

       112
       112
        
               ["zoxide" "zsh" "fzf" "starship" "direnv"]

     

       113
       113
        
               # dev stuff

     

       114
       114
       -
               ["helix" "git" "ssh"]

     

       114
       114
       +
               ["helix" "code" "git" "ssh"]

     

       115
       115
        
               ["lollypop"]

     

       116
       116
        
             ];

     

       117
       117
        
           in

+47 -17

users/patriot/stylix.nix

···

       10
       10
        
       

     

       11
       11
        
         stylix.image = ./wallpaper.png;

     

       12
       12
        
         stylix.polarity = "dark";

     

       13
       13
       -
         stylix.base16Scheme = {

     

       14
       14
       -
           "base00" = "04080e";

     

       15
       15
       -
           "base01" = "36393e";

     

       16
       16
       -
           "base02" = "686b6e";

     

       17
       17
       -
           "base03" = "9b9c9f";

     

       18
       18
       -
           "base04" = "cdcecf";

     

       19
       19
       -
           "base05" = "ffffff";

     

       20
       20
       -
           "base06" = "1d2126";

     

       21
       21
       -
           "base07" = "e6e6e7";

     

       22
       22
       -
           "base08" = "cf0466"; # splatoon 2 pink

     

       23
       23
       -
           "base09" = "2851f6"; # splatoon 1 blue

     

       24
       24
       -
           "base0A" = "6844e6"; # splatoon 3 purple

     

       25
       25
       -
           "base0B" = "17a80d"; # splatoon 2 green

     

       26
       26
       -
           "base0C" = "fea972"; # splatoon 3 fuzzy orange color

     

       27
       27
       -
           "base0D" = "fa5a00"; # splatoon 1 orange

     

       28
       28
       -
           "base0E" = "fffe27"; # splatoon 3 yellow

     

       29
       29
       -
           "base0F" = "bdbebc";

     

       13
       13
       +
         # stylix.base16Scheme = {

     

       14
       14
       +
         #   "base00" = "04080e";

     

       15
       15
       +
         #   "base01" = "36393e";

     

       16
       16
       +
         #   "base02" = "686b6e";

     

       17
       17
       +
         #   "base03" = "9b9c9f";

     

       18
       18
       +
         #   "base04" = "cdcecf";

     

       19
       19
       +
         #   "base05" = "ffffff";

     

       20
       20
       +
         #   "base06" = "1d2126";

     

       21
       21
       +
         #   "base07" = "e6e6e7";

     

       22
       22
       +
         #   "base08" = "cf0466"; # splatoon 2 pink

     

       23
       23
       +
         #   "base09" = "2851f6"; # splatoon 1 blue

     

       24
       24
       +
         #   "base0A" = "6844e6"; # splatoon 3 purple

     

       25
       25
       +
         #   "base0B" = "17a80d"; # splatoon 2 green

     

       26
       26
       +
         #   "base0C" = "fea972"; # splatoon 3 fuzzy orange color

     

       27
       27
       +
         #   "base0D" = "fa5a00"; # splatoon 1 orange

     

       28
       28
       +
         #   "base0E" = "fffe27"; # splatoon 3 yellow

     

       29
       29
       +
         #   "base0F" = "bdbebc";

     

       30
       30
       +
         # };

     

       31
       31
       +
         stylix.base16Scheme = let

     

       32
       32
       +
           night = "#2b292d";

     

       33
       33
       +
           ash = "#383539";

     

       34
       34
       +
           umber = "#4d424b";

     

       35
       35
       +
           bark = "#6F5D63";

     

       36
       36
       +
           mist = "#D1D1E0";

     

       37
       37
       +
           sage = "#B1B695";

     

       38
       38
       +
           blush = "#fecdb2";

     

       39
       39
       +
           coral = "#ffa07a";

     

       40
       40
       +
           rose = "#F6B6C9";

     

       41
       41
       +
           ember = "#e06b75";

     

       42
       42
       +
           honey = "#F5D76E";

     

       43
       43
       +
         in {

     

       44
       44
       +
           base00 = night;

     

       45
       45
       +
           base01 = ash;

     

       46
       46
       +
           base02 = umber;

     

       47
       47
       +
           base03 = bark;

     

       48
       48
       +
           base04 = blush;

     

       49
       49
       +
           base05 = mist;

     

       50
       50
       +
           base06 = mist;

     

       51
       51
       +
           base07 = bark;

     

       52
       52
       +
           base08 = ember;

     

       53
       53
       +
           base09 = honey;

     

       54
       54
       +
           base0A = rose;

     

       55
       55
       +
           base0B = sage;

     

       56
       56
       +
           base0C = bark;

     

       57
       57
       +
           base0D = coral;

     

       58
       58
       +
           base0E = blush;

     

       59
       59
       +
           base0F = umber;

     

       30
       60
        
         };

     

       31
       61
        
       

     

       32
       62
        
         stylix.fonts = {