dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
dusk 2022-04-10 08:18:19 +03:00
parent 7395765b09
commit b1432b7337
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
15 changed files with 21 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.envrc
View File

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

14
flake.lock
View File

@ -23,11 +23,11 @@
},
"latest": {
"locked": {
"lastModified": 1649225869,
"narHash": "sha256-u1zLtPmQzhT9mNXyM8Ey9pk7orDrIKdwooeGDEXm5xM=",
"lastModified": 1649408932,
"narHash": "sha256-JhTW1OtS5fACcRXLqcTTQyYO5vLkO+bceCqeRms13SY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b6966d911da89e5a7301aaef8b4f0a44c77e103c",
"rev": "42948b300670223ca8286aaf916bc381f66a5313",
"type": "github"
},
"original": {
@ -39,16 +39,16 @@
},
"nixos": {
"locked": {
"lastModified": 1649504202,
"narHash": "sha256-k7BZoTGeNqz+jy0v0kKl3jSa+6Q4Dx1FPpZFF9+u9nA=",
"lastModified": 1649490789,
"narHash": "sha256-YrhVxwoofZSx/wLZ4GYET//8vS+uqWX572zvdmP/Etg=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "27b0c3988745d1b18607744badaf2add79c8bcea",
"rev": "c86185d20d708013caf97a6adaa8dc6d72313c75",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "release-21.11",
"ref": "nixos-21.11",
"repo": "nixpkgs",
"type": "github"
}

2
flake.nix
View File

@ -2,7 +2,7 @@
description = "config!!!";
inputs = {
nixos.url = "github:nixos/nixpkgs/release-21.11";
nixos.url = "github:nixos/nixpkgs/nixos-21.11";
latest.url = "github:nixos/nixpkgs/nixos-unstable";
home.url = "github:nix-community/home-manager/release-21.11";

1
hosts/default.nix
View File

@ -19,6 +19,7 @@
modules =
baseModules
++ [
{networking.hostName = name;}
{nixpkgs.pkgs = pkgs;}
(import (./. + "/${name}/default.nix"))
];

2
modules/base/hm-system-defaults.nix
View File

@ -1,9 +1,11 @@
{config, ...}: {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.sharedModules = [
{
home.sessionVariables = {inherit (config.environment.sessionVariables) NIX_PATH;};
xdg.configFile."nix/registry.json".text = config.environment.etc."nix/registry.json".text;
xdg.configFile."nix/nix.conf".source = config.environment.etc."nix/nix.conf".source;
}
];
}

2
modules/base/nix.nix
View File

@ -14,10 +14,12 @@
keep-outputs = true
keep-derivations = true
fallback = true
extra-experimental-features = nix-command flakes
'';
useSandbox = true;
allowedUsers = ["@wheel"];
trustedUsers = ["root" "@wheel"];
autoOptimiseStore = true;
nixPath = ["nixpkgs=${inputs.latest}" "home-manager=${inputs.home}"];
};
}

2
modules/cachix/default.nix
View File

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

6
modules/cachix/harmony.nix
View File

@ -1,6 +0,0 @@
{
nix = {
settings.substituters = ["https://harmony.cachix.org"];
binaryCachePublicKeys = ["harmony.cachix.org-1:yv78QZHgS0UHkrMW56rccNghWHRz18fFRl8mWQ63M6E="];
};
}

6
modules/cachix/nix-cargo-integration.nix
View File

@ -1,6 +0,0 @@
{
nix = {
settings.substituters = ["https://nix-cargo-integration.cachix.org"];
binaryCachePublicKeys = ["nix-cargo-integration.cachix.org-1:wphySON/RyTC2DCzwKPBQGLEZv5mj0s1I1lsfQObaLs="];
};
}

2
modules/cachix/nix-community.nix
View File

@ -1,6 +1,6 @@
{
nix = {
settings.substituters = ["https://nix-community.cachix.org"];
binaryCaches = ["https://nix-community.cachix.org"];
binaryCachePublicKeys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
};
}

6
modules/cachix/nixpkgs-wayland.nix
View File

@ -1,6 +0,0 @@
{
nix = {
settings.substituters = ["https://nixpkgs-wayland.cachix.org"];
binaryCachePublicKeys = ["nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="];
};
}

6
modules/cachix/nrdxp.nix
View File

@ -1,6 +0,0 @@
{
nix = {
settings.substituters = ["https://nrdxp.cachix.org"];
binaryCachePublicKeys = ["nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4="];
};
}

6
modules/cachix/veloren-nix.nix
View File

@ -1,6 +0,0 @@
{
nix = {
settings.substituters = ["https://veloren-nix.cachix.org"];
binaryCachePublicKeys = ["veloren-nix.cachix.org-1:zokfKJqVsNV6kI/oJdLF6TYBdNPYGSb+diMVQPn/5Rc="];
};
}

4
pkgs-set/from-unstable.nix
View File

@ -5,7 +5,11 @@ pkgs: {
alejandra
rnix-lsp
chromium
rofi
rofi-wayland
vscode
nixUnstable
nix-direnv
direnv
;
}

12
users/patriot/default.nix
View File

@ -353,7 +353,6 @@ in {
"${mod}+q" = "kill";
"${mod}+Shift+e" = "exit";
"${mod}+Shift+r" = "reload";
"${mod}+c" = mkRofiCmd ["-show" "calc"];
# Screenshot and copy it to clipboard
"Mod1+s" = ''
exec export SFILE="${shotFile}.png" && ${grim} "$SFILE" && ${cat} "$SFILE" | ${wl-copy} -t image/png
@ -556,15 +555,6 @@ in {
cycle = true;
font = fontComb;
terminal = pkgBin "alacritty";
plugins = with pkgs; [
rofi-calc
rofi-systemd
rofi-file-browser
rofi-power-menu
];
extraConfig = {
modi = "drun,calc,file-browser-extended,ssh,keys";
};
};
vscode = {
enable = true;
@ -705,8 +695,6 @@ in {
theme = "mytheme"
[editor]
line-number = "relative"
[lsp]
display-messages = true
'';
"helix/languages.toml".text = ''
[[language]]