Compare commits

..

No commits in common. "aa97808cf7472b6e1d76c2f365dc0143a803470a" and "39d85691c61ec91d76095e7b96554ae67212034c" have entirely different histories.

7 changed files with 55 additions and 190 deletions

196
flake.lock generated
View file

@ -178,11 +178,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773889306, "lastModified": 1771469470,
"narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -250,11 +250,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1767039857, "lastModified": 1761588595,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -399,11 +399,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1772893680, "lastModified": 1763319842,
"narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -457,11 +457,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775425411, "lastModified": 1771744638,
"narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "narHash": "sha256-EDLi+YAsEEAmMeZe1v6GccuGRbCkpSZp/+A6g+pivR8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "rev": "cb6c151f5c9db4df0b69d06894dc8484de1f16a0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -471,47 +471,6 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": {
"inputs": {
"nixpkgs": [
"vpsadminos",
"impermanence",
"nixpkgs"
]
},
"locked": {
"lastModified": 1768598210,
"narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"impermanence": {
"inputs": {
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1769548169,
"narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "impermanence",
"type": "github"
}
},
"lsfg-vk-flake": { "lsfg-vk-flake": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -559,11 +518,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775365369, "lastModified": 1771734689,
"narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=", "narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3", "rev": "8f590b832326ab9699444f3a48240595954a4b10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -582,11 +541,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773912645, "lastModified": 1766537863,
"narHash": "sha256-QHzRqq6gh+t3F/QU9DkP7X63dDDcuIQmaDz12p7ANTg=", "narHash": "sha256-HEt+wbazRgJYeY+lgj65bxhPyVc4x7NEB2bs5NU6DF8=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5", "rev": "23f0a53ca6e58e61e1ea2b86791c69b79c91656d",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -614,11 +573,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1775710090, "lastModified": 1771369470,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa", "rev": "0182a361324364ae3f436a63005877674cf45efb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -627,38 +586,6 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgsUnstable": {
"locked": {
"lastModified": 1775710090,
"narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4c1018dae018162ec878d42fec712642d214fdfa",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1714091391,
"narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1659219666, "lastModified": 1659219666,
@ -707,11 +634,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1775811116, "lastModified": 1771574726,
"narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=", "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "54170c54449ea4d6725efd30d719c5e505f1c10e", "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -737,38 +664,6 @@
} }
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": {
"lastModified": 1768564909,
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1775811116,
"narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "54170c54449ea4d6725efd30d719c5e505f1c10e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1719010183, "lastModified": 1719010183,
"narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=", "narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=",
@ -784,6 +679,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": {
"locked": {
"lastModified": 1714091391,
"narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"plymouth-themes": { "plymouth-themes": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -895,11 +806,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775682595, "lastModified": 1771735105,
"narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=", "narHash": "sha256-MJuVJeszZEziquykEHh/hmgIHYxUcuoG/1aowpLiSeU=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76", "rev": "d7755d820f5fa8acf7f223309c33e25d4f92e74f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1040,11 +951,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1775636079, "lastModified": 1770228511,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1054,17 +965,12 @@
} }
}, },
"vpsadminos": { "vpsadminos": {
"inputs": {
"impermanence": "impermanence",
"nixpkgs": "nixpkgs_8",
"nixpkgsUnstable": "nixpkgsUnstable"
},
"locked": { "locked": {
"lastModified": 1775882020, "lastModified": 1771632757,
"narHash": "sha256-KzrYFXnPzoy284pibNT5HdouqyqMUuHrbRKCyPjHOhU=", "narHash": "sha256-Eb0v0imSKZDuZ6rCR7CX3PcGfPhdwsA6VFEQhQQQ+R8=",
"owner": "vpsfreecz", "owner": "vpsfreecz",
"repo": "vpsadminos", "repo": "vpsadminos",
"rev": "0aee41c6ba3b3299c437fbb363d6014b002f1645", "rev": "0000b3483cf507cb34c66ac3dcefc20228c85963",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1077,7 +983,7 @@
"inputs": { "inputs": {
"crane": "crane_3", "crane": "crane_3",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1758999384, "lastModified": 1758999384,
@ -1096,7 +1002,7 @@
"wl-crosshair": { "wl-crosshair": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_7", "flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_10" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1762293940, "lastModified": 1762293940,

View file

@ -161,25 +161,6 @@ in
useTmpfs = true; useTmpfs = true;
}; };
fileSystems."/nix/var/nix/builds" = {
device = "tmpfs";
fsType = "tmpfs";
options = [
"size=20G" # adjust for your situation and needs
"mode=700"
];
};
zramSwap.enable = true;
zramSwap.memoryPercent = 100;
boot.kernel.sysctl = {
"vm.swappiness" = 180;
"vm.watermark_boost_factor" = 0;
"vm.watermark_scale_factor" = 125;
"vm.page-cluster" = 0;
};
# swap # swap
# fileSystems."/swap" = { # fileSystems."/swap" = {
# device = "/dev/disk/by-label/BTRFS_ROOT"; # device = "/dev/disk/by-label/BTRFS_ROOT";

View file

@ -15,7 +15,7 @@ in
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
services.gitlab-runner = { services.gitlab-runner = {
enable = true; enable = true;
settings.concurrent = 4; settings.concurrent = 8;
services = { services = {
# runner for building in docker via host's nix-daemon # runner for building in docker via host's nix-daemon
# nix store will be readable in runner, might be insecure # nix store will be readable in runner, might be insecure

View file

@ -26,13 +26,7 @@ rec {
themes = ( themes = (
final: prev: { final: prev: {
papirus_red = (final.papirus-icon-theme.override { color = "red"; }).overrideAttrs { papirus_red = (final.papirus-icon-theme.override { color = "red"; });
dontPatchShebangs = true;
noAuditTmpdir = true;
dontAutoPatchelf = true;
dontPatchELF = true;
dontCheckForBrokenSymlinks = true;
};
orchis_theme_compact = ( orchis_theme_compact = (
final.orchis-theme.override { final.orchis-theme.override {
border-radius = 0; border-radius = 0;

View file

@ -86,7 +86,7 @@
comma comma
# System monitors # System monitors
(unstable.btop.override { rocmSupport = true; }) (btop.override { rocmSupport = true; })
amdgpu_top amdgpu_top
inxi inxi
dmidecode dmidecode

View file

@ -14,9 +14,6 @@ let
orange = color.normal.orange; orange = color.normal.orange;
brown = color.normal.brown; brown = color.normal.brown;
}; };
cursorNormalSpec = "${colors.accent_fg},${colors.accent_color}+fg";
cursorInsertSpec = "black,bright-green+b";
in in
with colors; with colors;
'' ''
@ -52,11 +49,8 @@ with colors;
# builtin faces # builtin faces
face global Default default,default face global Default default,default
face global PrimaryCursor ${cursorNormalSpec} face global PrimaryCursor ${accent_fg},${accent_color}+fg
face global PrimaryCursorEol PrimaryCursor face global PrimaryCursorEol PrimaryCursor
declare-option str cursor_normal_face '${cursorNormalSpec}'
declare-option str cursor_insert_face '${cursorInsertSpec}'
face global PrimarySelection default,${bg_light}+f face global PrimarySelection default,${bg_light}+f
face global SecondaryCursor default,default+rfg face global SecondaryCursor default,default+rfg

View file

@ -2,16 +2,6 @@ set global idle_timeout 500
enable-auto-pairs enable-auto-pairs
hook -group tell-mode global ModeChange push:.*:insert %{
set-face window PrimaryCursor %opt{cursor_insert_face}
set-face window PrimaryCursorEol %opt{cursor_insert_face}
}
hook -group tell-mode global ModeChange pop:insert:.* %{
set-face window PrimaryCursor %opt{cursor_normal_face}
set-face window PrimaryCursorEol %opt{cursor_normal_face}
}
hook global NormalIdle .* %{ evaluate-commands %sh{ hook global NormalIdle .* %{ evaluate-commands %sh{
hex_with_size() { hex_with_size() {
for i in 3 4 6 8; do for i in 3 4 6 8; do