+2 -2

.envrc

··· 1 1 - watch_file shell/* flake.nix 2 2 - use flake || use nix 1 1 + watch_file shells/* flake.nix flake.lock 2 2 + eval "$(nix print-dev-env)"

+7 -7

flake.lock

··· 23 23 }, 24 24 "latest": { 25 25 "locked": { 26 26 - "lastModified": 1649225869, 27 27 - "narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=", 26 26 + "lastModified": 1649408932, 27 27 + "narHash": "sha256-JhTW1OtS5fACcRXLqcTTQyYO5vLkO+bceCqeRms13SY=", 28 28 "owner": "nixos", 29 29 "repo": "nixpkgs", 30 30 - "rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c", 30 30 + "rev": "42948b300670223ca8286aaf916bc381f66a5313", 31 31 "type": "github" 32 32 }, 33 33 "original": { ··· 39 39 }, 40 40 "nixos": { 41 41 "locked": { 42 42 - "lastModified": 1649504202, 43 43 - "narHash": "sha256-k7BZoTGeNqz+jy0v0kKl3jSa+6Q4Dx1FPpZFF9+u9nA=", 42 42 + "lastModified": 1649490789, 43 43 + "narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=", 44 44 "owner": "nixos", 45 45 "repo": "nixpkgs", 46 46 - "rev": "27b0c3988745d1b18607744badaf2add79c8bcea", 46 46 + "rev": "c86185d20d708013caf97a6adaa8dc6d72313c75", 47 47 "type": "github" 48 48 }, 49 49 "original": { 50 50 "owner": "nixos", 51 51 - "ref": "release-21.11", 51 51 + "ref": "nixos-21.11", 52 52 "repo": "nixpkgs", 53 53 "type": "github" 54 54 }

+1 -1

flake.nix

··· 2 2 description = "config!!!"; 3 3 4 4 inputs = { 5 5 - nixos.url = "github:nixos/nixpkgs/release-21.11"; 5 5 + nixos.url = "github:nixos/nixpkgs/nixos-21.11"; 6 6 latest.url = "github:nixos/nixpkgs/nixos-unstable"; 7 7 8 8 home.url = "github:nix-community/home-manager/release-21.11";

+1

hosts/default.nix

··· 19 19 modules = 20 20 baseModules 21 21 ++ [ 22 22 + {networking.hostName = name;} 22 23 {nixpkgs.pkgs = pkgs;} 23 24 (import (./. + "/${name}/default.nix")) 24 25 ];

+2

modules/base/hm-system-defaults.nix

··· 1 1 {config, ...}: { 2 2 home-manager.useGlobalPkgs = true; 3 3 + home-manager.useUserPackages = true; 3 4 home-manager.sharedModules = [ 4 5 { 5 6 home.sessionVariables = {inherit (config.environment.sessionVariables) NIX_PATH;}; 6 7 xdg.configFile."nix/registry.json".text = config.environment.etc."nix/registry.json".text; 8 8 + xdg.configFile."nix/nix.conf".source = config.environment.etc."nix/nix.conf".source; 7 9 } 8 10 ]; 9 11 }

+2

modules/base/nix.nix

··· 14 14 keep-outputs = true 15 15 keep-derivations = true 16 16 fallback = true 17 17 + extra-experimental-features = nix-command flakes 17 18 ''; 18 19 useSandbox = true; 19 20 allowedUsers = ["@wheel"]; 20 21 trustedUsers = ["root" "@wheel"]; 21 22 autoOptimiseStore = true; 23 23 + nixPath = ["nixpkgs=${inputs.latest}" "home-manager=${inputs.home}"]; 22 24 }; 23 25 }

+1 -1

modules/cachix/default.nix

··· 8 8 filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key && key != "default.nix"; 9 9 imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder)); 10 10 in { 11 11 - #inherit imports; 11 11 + inherit imports; 12 12 nix.binaryCaches = ["https://cache.nixos.org/"]; 13 13 }

-6

modules/cachix/harmony.nix

··· 1 1 - { 2 2 - nix = { 3 3 - settings.substituters = ["https://harmony.cachix.org"]; 4 4 - binaryCachePublicKeys = ["harmony.cachix.org-1:yv78QZHgS0UHkrMW56rccNghWHRz18fFRl8mWQ63M6E="]; 5 5 - }; 6 6 - }

-6

modules/cachix/nix-cargo-integration.nix

··· 1 1 - { 2 2 - nix = { 3 3 - settings.substituters = ["https://nix-cargo-integration.cachix.org"]; 4 4 - binaryCachePublicKeys = ["nix-cargo-integration.cachix.org-1:wphySON/RyTC2DCzwKPBQGLEZv5mj0s1I1lsfQObaLs="]; 5 5 - }; 6 6 - }

+1 -1

modules/cachix/nix-community.nix

··· 1 1 { 2 2 nix = { 3 3 - settings.substituters = ["https://nix-community.cachix.org"]; 3 3 + binaryCaches = ["https://nix-community.cachix.org"]; 4 4 binaryCachePublicKeys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="]; 5 5 }; 6 6 }

-6

modules/cachix/nixpkgs-wayland.nix

··· 1 1 - { 2 2 - nix = { 3 3 - settings.substituters = ["https://nixpkgs-wayland.cachix.org"]; 4 4 - binaryCachePublicKeys = ["nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="]; 5 5 - }; 6 6 - }

-6

modules/cachix/nrdxp.nix

··· 1 1 - { 2 2 - nix = { 3 3 - settings.substituters = ["https://nrdxp.cachix.org"]; 4 4 - binaryCachePublicKeys = ["nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="]; 5 5 - }; 6 6 - }

-6

modules/cachix/veloren-nix.nix

··· 1 1 - { 2 2 - nix = { 3 3 - settings.substituters = ["https://veloren-nix.cachix.org"]; 4 4 - binaryCachePublicKeys = ["veloren-nix.cachix.org-1:zokfKJqVsNV6kI/oJdLF6TYBdNPYGSb+diMVQPn/5Rc="]; 5 5 - }; 6 6 - }

+4

pkgs-set/from-unstable.nix

··· 5 5 alejandra 6 6 rnix-lsp 7 7 chromium 8 8 + rofi 8 9 rofi-wayland 9 10 vscode 11 11 + nixUnstable 12 12 + nix-direnv 13 13 + direnv 10 14 ; 11 15 }

-12

users/patriot/default.nix

··· 353 353 "${mod}+q" = "kill"; 354 354 "${mod}+Shift+e" = "exit"; 355 355 "${mod}+Shift+r" = "reload"; 356 356 - "${mod}+c" = mkRofiCmd ["-show" "calc"]; 357 356 # Screenshot and copy it to clipboard 358 357 "Mod1+s" = '' 359 358 exec export SFILE="${shotFile}.png" && ${grim} "$SFILE" && ${cat} "$SFILE" | ${wl-copy} -t image/png ··· 556 555 cycle = true; 557 556 font = fontComb; 558 557 terminal = pkgBin "alacritty"; 559 559 - plugins = with pkgs; [ 560 560 - rofi-calc 561 561 - rofi-systemd 562 562 - rofi-file-browser 563 563 - rofi-power-menu 564 564 - ]; 565 565 - extraConfig = { 566 566 - modi = "drun,calc,file-browser-extended,ssh,keys"; 567 567 - }; 568 558 }; 569 559 vscode = { 570 560 enable = true; ··· 705 695 theme = "mytheme" 706 696 [editor] 707 697 line-number = "relative" 708 708 - [lsp] 709 709 - display-messages = true 710 698 ''; 711 699 "helix/languages.toml".text = '' 712 700 [[language]]