diff --git a/flake.lock b/flake.lock index cdea966..8091b18 100644 --- a/flake.lock +++ b/flake.lock @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1773889306, - "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", + "lastModified": 1771469470, + "narHash": "sha256-GnqdqhrguKNN3HtVfl6z+zbV9R9jhHFm3Z8nu7R6ml0=", "owner": "nix-community", "repo": "disko", - "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", + "rev": "4707eec8d1d2db5182ea06ed48c820a86a42dc13", "type": "github" }, "original": { @@ -250,11 +250,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -399,11 +399,11 @@ ] }, "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1775425411, - "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", + "lastModified": 1771744638, + "narHash": "sha256-EDLi+YAsEEAmMeZe1v6GccuGRbCkpSZp/+A6g+pivR8=", "owner": "nix-community", "repo": "home-manager", - "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", + "rev": "cb6c151f5c9db4df0b69d06894dc8484de1f16a0", "type": "github" }, "original": { @@ -471,47 +471,6 @@ "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": { "inputs": { "nixpkgs": [ @@ -559,11 +518,11 @@ ] }, "locked": { - "lastModified": 1775365369, - "narHash": "sha256-DgH5mveLoau20CuTnaU5RXZWgFQWn56onQ4Du2CqYoI=", + "lastModified": 1771734689, + "narHash": "sha256-/phvMgr1yutyAMjKnZlxkVplzxHiz60i4rc+gKzpwhg=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "cef5cf82671e749ac87d69aadecbb75967e6f6c3", + "rev": "8f590b832326ab9699444f3a48240595954a4b10", "type": "github" }, "original": { @@ -582,11 +541,11 @@ ] }, "locked": { - "lastModified": 1773912645, - "narHash": "sha256-QHzRqq6gh+t3F/QU9DkP7X63dDDcuIQmaDz12p7ANTg=", + "lastModified": 1766537863, + "narHash": "sha256-HEt+wbazRgJYeY+lgj65bxhPyVc4x7NEB2bs5NU6DF8=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5", + "rev": "23f0a53ca6e58e61e1ea2b86791c69b79c91656d", "type": "gitlab" }, "original": { @@ -614,11 +573,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -627,38 +586,6 @@ "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": { "locked": { "lastModified": 1659219666, @@ -707,11 +634,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1775811116, - "narHash": "sha256-t+HZK42pB6N+i5RGbuy7Xluez/VvWbembBdvzsc23Ss=", + "lastModified": 1771574726, + "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54170c54449ea4d6725efd30d719c5e505f1c10e", + "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d", "type": "github" }, "original": { @@ -737,38 +664,6 @@ } }, "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": { "lastModified": 1719010183, "narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=", @@ -784,6 +679,22 @@ "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": { "flake": false, "locked": { @@ -895,11 +806,11 @@ ] }, "locked": { - "lastModified": 1775682595, - "narHash": "sha256-0E9PohY/VuESLq0LR4doaH7hTag513sDDW5n5qmHd1Q=", + "lastModified": 1771735105, + "narHash": "sha256-MJuVJeszZEziquykEHh/hmgIHYxUcuoG/1aowpLiSeU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "d2e8438d5886e92bc5e7c40c035ab6cae0c41f76", + "rev": "d7755d820f5fa8acf7f223309c33e25d4f92e74f", "type": "github" }, "original": { @@ -1040,11 +951,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": { @@ -1054,17 +965,12 @@ } }, "vpsadminos": { - "inputs": { - "impermanence": "impermanence", - "nixpkgs": "nixpkgs_8", - "nixpkgsUnstable": "nixpkgsUnstable" - }, "locked": { - "lastModified": 1775882020, - "narHash": "sha256-KzrYFXnPzoy284pibNT5HdouqyqMUuHrbRKCyPjHOhU=", + "lastModified": 1771632757, + "narHash": "sha256-Eb0v0imSKZDuZ6rCR7CX3PcGfPhdwsA6VFEQhQQQ+R8=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "0aee41c6ba3b3299c437fbb363d6014b002f1645", + "rev": "0000b3483cf507cb34c66ac3dcefc20228c85963", "type": "github" }, "original": { @@ -1077,7 +983,7 @@ "inputs": { "crane": "crane_3", "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1758999384, @@ -1096,7 +1002,7 @@ "wl-crosshair": { "inputs": { "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1762293940, diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 15ba704..bc673a0 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -161,25 +161,6 @@ in 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 # fileSystems."/swap" = { # device = "/dev/disk/by-label/BTRFS_ROOT"; diff --git a/hosts/monolith/monolith-gitlab-runner.nix b/hosts/monolith/monolith-gitlab-runner.nix index 87983a1..8de40bc 100644 --- a/hosts/monolith/monolith-gitlab-runner.nix +++ b/hosts/monolith/monolith-gitlab-runner.nix @@ -15,7 +15,7 @@ in virtualisation.docker.enable = true; services.gitlab-runner = { enable = true; - settings.concurrent = 4; + settings.concurrent = 8; services = { # runner for building in docker via host's nix-daemon # nix store will be readable in runner, might be insecure diff --git a/overlays/default.nix b/overlays/default.nix index a7a3073..1445371 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -26,13 +26,7 @@ rec { themes = ( final: prev: { - papirus_red = (final.papirus-icon-theme.override { color = "red"; }).overrideAttrs { - dontPatchShebangs = true; - noAuditTmpdir = true; - dontAutoPatchelf = true; - dontPatchELF = true; - dontCheckForBrokenSymlinks = true; - }; + papirus_red = (final.papirus-icon-theme.override { color = "red"; }); orchis_theme_compact = ( final.orchis-theme.override { border-radius = 0; diff --git a/user/home.nix b/user/home.nix index 98fc13a..f6cc1e8 100644 --- a/user/home.nix +++ b/user/home.nix @@ -86,7 +86,7 @@ comma # System monitors - (unstable.btop.override { rocmSupport = true; }) + (btop.override { rocmSupport = true; }) amdgpu_top inxi dmidecode diff --git a/user/kakoune/colors.nix b/user/kakoune/colors.nix index ae3f2a8..a0917d4 100644 --- a/user/kakoune/colors.nix +++ b/user/kakoune/colors.nix @@ -14,9 +14,6 @@ let orange = color.normal.orange; brown = color.normal.brown; }; - - cursorNormalSpec = "${colors.accent_fg},${colors.accent_color}+fg"; - cursorInsertSpec = "black,bright-green+b"; in with colors; '' @@ -52,11 +49,8 @@ with colors; # builtin faces face global Default default,default - face global PrimaryCursor ${cursorNormalSpec} + face global PrimaryCursor ${accent_fg},${accent_color}+fg 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 SecondaryCursor default,default+rfg diff --git a/user/kakoune/hooks.kak b/user/kakoune/hooks.kak index c1f55ad..5bc243e 100644 --- a/user/kakoune/hooks.kak +++ b/user/kakoune/hooks.kak @@ -2,16 +2,6 @@ set global idle_timeout 500 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{ hex_with_size() { for i in 3 4 6 8; do