commit b1432b7337f59be3598774200e256abf1d3263ac · ptr.pet/ark

+2 -2

.envrc

···

       1
       -
       watch_file shell/* flake.nix

     

       2
       -
       use flake || use nix

···

       1
       +
       watch_file shells/* flake.nix flake.lock

     

       2
       +
       eval "$(nix print-dev-env)"

+7 -7

flake.lock

···

       23
        
           },

     

       24
        
           "latest": {

     

       25
        
             "locked": {

     

       26
       -
               "lastModified": 1649225869,

     

       27
       -
               "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=",

     

       28
        
               "owner": "nixos",

     

       29
        
               "repo": "nixpkgs",

     

       30
       -
               "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c",

     

       31
        
               "type": "github"

     

       32
        
             },

     

       33
        
             "original": {

     
···

       39
        
           },

     

       40
        
           "nixos": {

     

       41
        
             "locked": {

     

       42
       -
               "lastModified": 1649504202,

     

       43
       -
               "narHash": "sha256-k7BZoTGeNqz+jy0v0kKl3jSa+6Q4Dx1FPpZFF9+u9nA=",

     

       44
        
               "owner": "nixos",

     

       45
        
               "repo": "nixpkgs",

     

       46
       -
               "rev": "27b0c3988745d1b18607744badaf2add79c8bcea",

     

       47
        
               "type": "github"

     

       48
        
             },

     

       49
        
             "original": {

     

       50
        
               "owner": "nixos",

     

       51
       -
               "ref": "release-21.11",

     

       52
        
               "repo": "nixpkgs",

     

       53
        
               "type": "github"

     

       54
        
             }

···

       23
        
           },

     

       24
        
           "latest": {

     

       25
        
             "locked": {

     

       26
       +
               "lastModified": 1649408932,

     

       27
       +
               "narHash": "sha256-JhTW1OtS5fACcRXLqcTTQyYO5vLkO+bceCqeRms13SY=",

     

       28
        
               "owner": "nixos",

     

       29
        
               "repo": "nixpkgs",

     

       30
       +
               "rev": "42948b300670223ca8286aaf916bc381f66a5313",

     

       31
        
               "type": "github"

     

       32
        
             },

     

       33
        
             "original": {

     
···

       39
        
           },

     

       40
        
           "nixos": {

     

       41
        
             "locked": {

     

       42
       +
               "lastModified": 1649490789,

     

       43
       +
               "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",

     

       44
        
               "owner": "nixos",

     

       45
        
               "repo": "nixpkgs",

     

       46
       +
               "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",

     

       47
        
               "type": "github"

     

       48
        
             },

     

       49
        
             "original": {

     

       50
        
               "owner": "nixos",

     

       51
       +
               "ref": "nixos-21.11",

     

       52
        
               "repo": "nixpkgs",

     

       53
        
               "type": "github"

     

       54
        
             }

+1 -1

flake.nix

···

       2
        
         description = "config!!!";

     

       3
        
       

     

       4
        
         inputs = {

     

       5
       -
           nixos.url = "github:nixos/nixpkgs/release-21.11";

     

       6
        
           latest.url = "github:nixos/nixpkgs/nixos-unstable";

     

       7
        
       

     

       8
        
           home.url = "github:nix-community/home-manager/release-21.11";

···

       2
        
         description = "config!!!";

     

       3
        
       

     

       4
        
         inputs = {

     

       5
       +
           nixos.url = "github:nixos/nixpkgs/nixos-21.11";

     

       6
        
           latest.url = "github:nixos/nixpkgs/nixos-unstable";

     

       7
        
       

     

       8
        
           home.url = "github:nix-community/home-manager/release-21.11";

+1

hosts/default.nix

···

       19
        
             modules =

     

       20
        
               baseModules

     

       21
        
               ++ [

     

       0
        
       
     

       22
        
                 {nixpkgs.pkgs = pkgs;}

     

       23
        
                 (import (./. + "/${name}/default.nix"))

     

       24
        
               ];

···

       19
        
             modules =

     

       20
        
               baseModules

     

       21
        
               ++ [

     

       22
       +
                 {networking.hostName = name;}

     

       23
        
                 {nixpkgs.pkgs = pkgs;}

     

       24
        
                 (import (./. + "/${name}/default.nix"))

     

       25
        
               ];

+2

modules/base/hm-system-defaults.nix

···

       1
        
       {config, ...}: {

     

       2
        
         home-manager.useGlobalPkgs = true;

     

       0
        
       
     

       3
        
         home-manager.sharedModules = [

     

       4
        
           {

     

       5
        
             home.sessionVariables = {inherit (config.environment.sessionVariables) NIX_PATH;};

     

       6
        
             xdg.configFile."nix/registry.json".text = config.environment.etc."nix/registry.json".text;

     

       0
        
       
     

       7
        
           }

     

       8
        
         ];

     

       9
        
       }

···

       1
        
       {config, ...}: {

     

       2
        
         home-manager.useGlobalPkgs = true;

     

       3
       +
         home-manager.useUserPackages = true;

     

       4
        
         home-manager.sharedModules = [

     

       5
        
           {

     

       6
        
             home.sessionVariables = {inherit (config.environment.sessionVariables) NIX_PATH;};

     

       7
        
             xdg.configFile."nix/registry.json".text = config.environment.etc."nix/registry.json".text;

     

       8
       +
             xdg.configFile."nix/nix.conf".source = config.environment.etc."nix/nix.conf".source;

     

       9
        
           }

     

       10
        
         ];

     

       11
        
       }

+2

modules/base/nix.nix

···

       14
        
             keep-outputs = true

     

       15
        
             keep-derivations = true

     

       16
        
             fallback = true

     

       0
        
       
     

       17
        
           '';

     

       18
        
           useSandbox = true;

     

       19
        
           allowedUsers = ["@wheel"];

     

       20
        
           trustedUsers = ["root" "@wheel"];

     

       21
        
           autoOptimiseStore = true;

     

       0
        
       
     

       22
        
         };

     

       23
        
       }

···

       14
        
             keep-outputs = true

     

       15
        
             keep-derivations = true

     

       16
        
             fallback = true

     

       17
       +
             extra-experimental-features = nix-command flakes

     

       18
        
           '';

     

       19
        
           useSandbox = true;

     

       20
        
           allowedUsers = ["@wheel"];

     

       21
        
           trustedUsers = ["root" "@wheel"];

     

       22
        
           autoOptimiseStore = true;

     

       23
       +
           nixPath = ["nixpkgs=${inputs.latest}" "home-manager=${inputs.home}"];

     

       24
        
         };

     

       25
        
       }

+1 -1

modules/cachix/default.nix

···

       8
        
         filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";

     

       9
        
         imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));

     

       10
        
       in {

     

       11
       -
         #inherit imports;

     

       12
        
         nix.binaryCaches = ["https://cache.nixos.org/"];

     

       13
        
       }

···

       8
        
         filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix";

     

       9
        
         imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder));

     

       10
        
       in {

     

       11
       +
         inherit imports;

     

       12
        
         nix.binaryCaches = ["https://cache.nixos.org/"];

     

       13
        
       }

-6

modules/cachix/harmony.nix

···

       1
       -
       {

     

       2
       -
         nix = {

     

       3
       -
           settings.substituters = ["https://harmony.cachix.org"];

     

       4
       -
           binaryCachePublicKeys = ["harmony.cachix.org-1:yv78QZHgS0UHkrMW56rccNghWHRz18fFRl8mWQ63M6E="];

     

       5
       -
         };

     

       6
       -
       }

-6

modules/cachix/nix-cargo-integration.nix

···

       1
       -
       {

     

       2
       -
         nix = {

     

       3
       -
           settings.substituters = ["https://nix-cargo-integration.cachix.org"];

     

       4
       -
           binaryCachePublicKeys = ["nix-cargo-integration.cachix.org-1:wphySON/RyTC2DCzwKPBQGLEZv5mj0s1I1lsfQObaLs="];

     

       5
       -
         };

     

       6
       -
       }

+1 -1

modules/cachix/nix-community.nix

···

       1
        
       {

     

       2
        
         nix = {

     

       3
       -
           settings.substituters = ["https://nix-community.cachix.org"];

     

       4
        
           binaryCachePublicKeys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];

     

       5
        
         };

     

       6
        
       }

···

       1
        
       {

     

       2
        
         nix = {

     

       3
       +
           binaryCaches = ["https://nix-community.cachix.org"];

     

       4
        
           binaryCachePublicKeys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];

     

       5
        
         };

     

       6
        
       }

-6

modules/cachix/nixpkgs-wayland.nix

···

       1
       -
       {

     

       2
       -
         nix = {

     

       3
       -
           settings.substituters = ["https://nixpkgs-wayland.cachix.org"];

     

       4
       -
           binaryCachePublicKeys = ["nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="];

     

       5
       -
         };

     

       6
       -
       }

-6

modules/cachix/nrdxp.nix

···

       1
       -
       {

     

       2
       -
         nix = {

     

       3
       -
           settings.substituters = ["https://nrdxp.cachix.org"];

     

       4
       -
           binaryCachePublicKeys = ["nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="];

     

       5
       -
         };

     

       6
       -
       }

-6

modules/cachix/veloren-nix.nix

···

       1
       -
       {

     

       2
       -
         nix = {

     

       3
       -
           settings.substituters = ["https://veloren-nix.cachix.org"];

     

       4
       -
           binaryCachePublicKeys = ["veloren-nix.cachix.org-1:zokfKJqVsNV6kI/oJdLF6TYBdNPYGSb+diMVQPn/5Rc="];

     

       5
       -
         };

     

       6
       -
       }

+4

pkgs-set/from-unstable.nix

···

       5
        
           alejandra

     

       6
        
           rnix-lsp

     

       7
        
           chromium

     

       0
        
       
     

       8
        
           rofi-wayland

     

       9
        
           vscode

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10
        
           ;

     

       11
        
       }

···

       5
        
           alejandra

     

       6
        
           rnix-lsp

     

       7
        
           chromium

     

       8
       +
           rofi

     

       9
        
           rofi-wayland

     

       10
        
           vscode

     

       11
       +
           nixUnstable

     

       12
       +
           nix-direnv

     

       13
       +
           direnv

     

       14
        
           ;

     

       15
        
       }

-12

users/patriot/default.nix

···

       353
        
                     "${mod}+q" = "kill";

     

       354
        
                     "${mod}+Shift+e" = "exit";

     

       355
        
                     "${mod}+Shift+r" = "reload";

     

       356
       -
                     "${mod}+c" = mkRofiCmd ["-show" "calc"];

     

       357
        
                     # Screenshot and copy it to clipboard

     

       358
        
                     "Mod1+s" = ''

     

       359
        
                       exec export SFILE="${shotFile}.png" && ${grim} "$SFILE" && ${cat} "$SFILE" | ${wl-copy} -t image/png

     
···

       556
        
               cycle = true;

     

       557
        
               font = fontComb;

     

       558
        
               terminal = pkgBin "alacritty";

     

       559
       -
               plugins = with pkgs; [

     

       560
       -
                 rofi-calc

     

       561
       -
                 rofi-systemd

     

       562
       -
                 rofi-file-browser

     

       563
       -
                 rofi-power-menu

     

       564
       -
               ];

     

       565
       -
               extraConfig = {

     

       566
       -
                 modi = "drun,calc,file-browser-extended,ssh,keys";

     

       567
       -
               };

     

       568
        
             };

     

       569
        
             vscode = {

     

       570
        
               enable = true;

     
···

       705
        
                 theme = "mytheme"

     

       706
        
                 [editor]

     

       707
        
                 line-number = "relative"

     

       708
       -
                 [lsp]

     

       709
       -
                 display-messages = true

     

       710
        
               '';

     

       711
        
               "helix/languages.toml".text = ''

     

       712
        
                 [[language]]

···

       353
        
                     "${mod}+q" = "kill";

     

       354
        
                     "${mod}+Shift+e" = "exit";

     

       355
        
                     "${mod}+Shift+r" = "reload";

     

       0
        
       
     

       356
        
                     # Screenshot and copy it to clipboard

     

       357
        
                     "Mod1+s" = ''

     

       358
        
                       exec export SFILE="${shotFile}.png" && ${grim} "$SFILE" && ${cat} "$SFILE" | ${wl-copy} -t image/png

     
···

       555
        
               cycle = true;

     

       556
        
               font = fontComb;

     

       557
        
               terminal = pkgBin "alacritty";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       558
        
             };

     

       559
        
             vscode = {

     

       560
        
               enable = true;

     
···

       695
        
                 theme = "mytheme"

     

       696
        
                 [editor]

     

       697
        
                 line-number = "relative"

     

       0
        
       
     

       0
        
       
     

       698
        
               '';

     

       699
        
               "helix/languages.toml".text = ''

     

       700
        
                 [[language]]