diff --git a/flake.lock b/flake.lock index 5e9417a..8a76cc0 100644 --- a/flake.lock +++ b/flake.lock @@ -21,28 +21,28 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1765809053, - "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", "type": "github" } }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1760703920, - "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "d646af9b7d14bff08824538164af99d0c521b185", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", "type": "github" }, "original": { @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1765831383, - "narHash": "sha256-P5F/VPjjGw7s0AOTPb3z3gxqtH0YkAnd/c9P6QdWrEU=", + "lastModified": 1762776565, + "narHash": "sha256-Trd4uVhg9OggkxBMn3qUv74z9rNZE/s7iT7llTYQ0ZU=", "owner": "HeitorAugustoLN", "repo": "cosmic-manager", - "rev": "819d4d21fb90460dd11416d81d2cff65a53b8a59", + "rev": "f26cdfef90b8db37db913f7c72a609c997700e59", "type": "github" }, "original": { @@ -95,11 +95,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764724327, - "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1765835352, - "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "a34fae9c08a15ad73f295041fec82323541400a9", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "4524271976b625a4a605beefd893f270620fd751", "type": "github" }, "original": { @@ -209,11 +209,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1764524476, - "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", + "lastModified": 1762869044, + "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", + "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", "type": "gitlab" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1767514898, - "narHash": "sha256-ONYqnKrPzfKEEPChoJ9qPcfvBqW9ZgieDKD7UezWPg4=", + "lastModified": 1764736872, + "narHash": "sha256-4mqLegNQeD54X7enm6EI9aNWl6CaIfyhl5PaYoGYwqk=", "owner": "nix-community", "repo": "home-manager", - "rev": "7a06e8a2f844e128d3b210a000a62716b6040b7f", + "rev": "3366918730bb6b699395a9d237397f1d710a94b3", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1767232402, - "narHash": "sha256-li+h6crnhc5Zqs+M6pn7D7M0W9M63ECNennDjRgzioE=", + "lastModified": 1764554060, + "narHash": "sha256-vewrwjGqublgja1bvlIybRnlltKHLNlnP7WYDg+9h1Y=", "owner": "musnix", "repo": "musnix", - "rev": "d65f98e0b1f792365f1705653d7b2d266ceeff6e", + "rev": "599562080b2901046829ca69e0d1461041d27b32", "type": "github" }, "original": { @@ -303,11 +303,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1767544157, - "narHash": "sha256-DVTMOUd4uHkDcZXWAqOS+Pa0M9a27G1Ya3B7SFG6BQs=", + "lastModified": 1764721873, + "narHash": "sha256-EHMH54iI7MYYb7mUBE6JUtbbVhHTF7jtkuZ0Lo1bkBg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d0e2c4bebf9d0b879410736f7abce628976bfb92", + "rev": "f3935696628433007c582fc323730ba18f137a1d", "type": "github" }, "original": { @@ -336,11 +336,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1767530622, - "narHash": "sha256-ywnL1cc0A6fni7m859ImiBYA8DlXXJ+5OXIlcBqJ2B0=", + "lastModified": 1764678181, + "narHash": "sha256-TMs2Px19UAG06zITXAH7efl7X8G7BDyMCy1ilX/8wy0=", "owner": "YaLTeR", "repo": "niri", - "rev": "54c2e2ab476629d17fdba861895f58e7cdac32ab", + "rev": "f874b2fce50e0f7ba21e270c86cfa168a1506b82", "type": "github" }, "original": { @@ -351,11 +351,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -367,27 +367,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1767480499, - "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1767480499, - "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -422,11 +422,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1767448089, - "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=", + "lastModified": 1764755396, + "narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=", "owner": "nix-community", "repo": "nixvim", - "rev": "983751b66f255bbea1adc185364e9e7b73f82358", + "rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1764773531, - "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", "owner": "nix-community", "repo": "NUR", - "rev": "1d9616689e98beded059ad0384b9951e967a17fa", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", "type": "github" }, "original": { @@ -504,11 +504,11 @@ ] }, "locked": { - "lastModified": 1767499857, - "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1766603740, - "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=", + "lastModified": 1764695017, + "narHash": "sha256-hJVPGt8MqRL0WHkNRclT4J1rJMurYsPw7dL8UwlFoaI=", "owner": "danth", "repo": "stylix", - "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0", + "rev": "a1e741dbce6e846129777c2a017e1354bc87b92b", "type": "github" }, "original": { @@ -633,11 +633,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1763914658, - "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", "type": "github" }, "original": { @@ -649,11 +649,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1764465359, - "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", "type": "github" }, "original": { @@ -665,11 +665,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1764464512, - "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", "type": "github" }, "original": { @@ -698,11 +698,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1766429945, - "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", + "lastModified": 1764721075, + "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", + "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", "type": "github" }, "original": { @@ -716,11 +716,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1767307876, - "narHash": "sha256-d5EKvUnfr6tdhymIThz0WGG0JHT2cCZzbZK4t2CwYuc=", + "lastModified": 1764648680, + "narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "c5bffaf433e6137fe80cd1930584836f11119b26", + "rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 1857f36..dc82f00 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ zenix = mkConf { nixos-modules = [ ./hardware/zenix.nix - ./nixos/programs/hyprland.nix + ./nixos/programs/niri.nix ./nixos/programs/gamer.nix ./nixos/programs/personal.nix ./nixos/services/musnix.nix @@ -67,7 +67,7 @@ ./hardware/framework-13.nix ./nixos/workstation.nix ./nixos/modules/work.nix - ./nixos/programs/hyprland.nix + ./nixos/programs/niri.nix ]; home-modules = [ ./home/programs/work.nix diff --git a/hardware/framework-13.nix b/hardware/framework-13.nix index 50f4e12..dd70137 100644 --- a/hardware/framework-13.nix +++ b/hardware/framework-13.nix @@ -80,40 +80,40 @@ ''; }; - # programs.niri.settings.outputs = { - # # Laptop display - # "eDP-1" = { - # mode = { - # width = 2256; - # height = 1504; - # refresh = 59.999; - # }; - # }; - # "HP Inc. HP 24x 1CR9500W9Q" = { - # mode = { - # width = 1920; - # height = 1080; - # refresh = 144.001; - # }; - # scale = 1.0; - # position = { - # x = 2256; - # y = 0; - # }; - # }; - # "Ancor Communications Inc ASUS VS228 F3LMTF154813" = { - # mode = { - # width = 1920; - # height = 1080; - # refresh = 60.0; - # }; - # scale = 1.0; - # position = { - # x = 2256 + 1920; - # y = 0; - # }; - # }; - # }; + programs.niri.settings.outputs = { + # Laptop display + "eDP-1" = { + mode = { + width = 2256; + height = 1504; + refresh = 59.999; + }; + }; + "HP Inc. HP 24x 1CR9500W9Q" = { + mode = { + width = 1920; + height = 1080; + refresh = 144.001; + }; + scale = 1.0; + position = { + x = 2256; + y = 0; + }; + }; + "Ancor Communications Inc ASUS VS228 F3LMTF154813" = { + mode = { + width = 1920; + height = 1080; + refresh = 60.0; + }; + scale = 1.0; + position = { + x = 2256 + 1920; + y = 0; + }; + }; + }; } ]; diff --git a/hardware/zenix.nix b/hardware/zenix.nix index 4c8da19..daba723 100644 --- a/hardware/zenix.nix +++ b/hardware/zenix.nix @@ -68,6 +68,10 @@ hardware.amdgpu = { opencl.enable = true; + amdvlk = { + enable = true; + support32Bit.enable = true; + }; }; networking.hostName = "zenix"; @@ -81,26 +85,26 @@ home-manager.users.${user}.imports = [ { home.stateVersion = "22.05"; - # programs.niri.settings = { - # outputs."HP Inc. HP 24x 1CR9500W9Q" = { - # mode = { - # width = 1920; - # height = 1080; - # refresh = 143.855; - # }; - # variable-refresh-rate = true; - # scale = 1.0; - # }; - # outputs."HDMI-A-1" = { - # mode = { - # width = 3840; - # height = 2160; - # refresh = 120.0; - # }; - # variable-refresh-rate = true; - # scale = 2.5; - # }; - # }; + programs.niri.settings = { + outputs."HP Inc. HP 24x 1CR9500W9Q" = { + mode = { + width = 1920; + height = 1080; + refresh = 143.855; + }; + variable-refresh-rate = true; + scale = 1.0; + }; + outputs."HDMI-A-1" = { + mode = { + width = 3840; + height = 2160; + refresh = 120.0; + }; + variable-refresh-rate = true; + scale = 2.5; + }; + }; } ]; } diff --git a/home/desktop/hyprland/default.nix b/home/desktop/hyprland/default.nix index 2bb165c..81efc71 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -33,10 +33,11 @@ in { scroll_factor = 0.5; }; kb_options = lib.mkDefault "caps:escape"; - kb_layout = lib.mkDefault "us"; - kb_variant = lib.mkDefault "dvorak"; + kb_layout = lib.mkDefault "gb"; numlock_by_default = true; - accel_profile = "flat"; + }; + gestures = { + workspace_swipe = true; }; decoration = { rounding = 0; diff --git a/home/programs/gamer.nix b/home/programs/gamer.nix index 99e8627..e58aa94 100644 --- a/home/programs/gamer.nix +++ b/home/programs/gamer.nix @@ -2,7 +2,7 @@ home.packages = with pkgs; [ # Games airshipper - luanti + minetest superTuxKart xonotic diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index 78b8460..c21ccd5 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -67,4 +67,12 @@ ]; }; + programs.zed-editor = { + enable = true; + extensions = ["tsgo" "nix" "ansible" "helm"]; + userSettings = { + vim_mode = true; + }; + extraPackages = [pkgs.nixd pkgs.vtsls]; + }; } diff --git a/home/programs/personal/default.nix b/home/programs/personal/default.nix index 8d4c32d..e1ec3a1 100644 --- a/home/programs/personal/default.nix +++ b/home/programs/personal/default.nix @@ -38,6 +38,7 @@ krita organicmaps anki + bookworm jellyfin-mpv-shim ]; } diff --git a/nixos/programs/gamer.nix b/nixos/programs/gamer.nix index ffd64c0..e1ddbec 100644 --- a/nixos/programs/gamer.nix +++ b/nixos/programs/gamer.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { allowUnfreePkgNames = [ "steam" "steam-unwrapped" @@ -27,15 +27,4 @@ capSysNice = true; }; programs.gamemode.enable = true; - nixpkgs.config.permittedInsecurePackages = [ - "mbedtls-2.28.10" - ]; - services.xserver.desktopManager.retroarch = { - enable = true; - package = pkgs.retroarch.withCores (cores: - with cores; [ - bsnes - beetle-psx-hw - ]); - }; } diff --git a/nixos/programs/personal.nix b/nixos/programs/personal.nix index 40f5cbd..2a937b6 100644 --- a/nixos/programs/personal.nix +++ b/nixos/programs/personal.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{...}: { i18n.supportedLocales = [ "eo/UTF-8" "en_GB.UTF-8/UTF-8" @@ -9,8 +9,4 @@ enable = true; }; }; - environment.systemPackages = with pkgs; [ - warpinator - ]; - networking.firewall.allowedTCPPorts = [42000 42001]; } diff --git a/nixos/services/grafana.nix b/nixos/services/grafana.nix index 7499aca..9c8497d 100644 --- a/nixos/services/grafana.nix +++ b/nixos/services/grafana.nix @@ -61,7 +61,7 @@ in { { name = "synapse"; url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json"; - sha256 = "sha256:1lhhhzjm1rj25gg6dnmgwaxr05f8p2ndrlygdnjqzam7s6y75db3"; + sha256 = "sha256:0yzj1i4zbjy9cms75ip6ad8qyjgv9kka42gxsbzyzr2syznsmqw0"; } ]; } diff --git a/nixos/services/prometheus.nix b/nixos/services/prometheus.nix index fb29da9..bae5c9f 100644 --- a/nixos/services/prometheus.nix +++ b/nixos/services/prometheus.nix @@ -3,7 +3,7 @@ nodes = [ "alpine" "100.106.49.128" # laptop - "100.78.76.10" # gaming pc + "100.65.29.110" # gaming pc ]; addPort = ip: "${ip}:${toString prometheus.exporters.node.port}"; in { @@ -68,13 +68,11 @@ in { configuration = { route = { receiver = "alertmanager-ntfy"; - routes = [ - { - matchers = [ - ''node_filesystem_device_error != 0'' - ]; - } - ]; + routes = [{ + matchers = [ + ''node_filesystem_device_error != 0'' + ]; + }]; }; }; }; diff --git a/nixos/services/vaultwarden.nix b/nixos/services/vaultwarden.nix index 907ebb5..dddb0ef 100644 --- a/nixos/services/vaultwarden.nix +++ b/nixos/services/vaultwarden.nix @@ -5,10 +5,6 @@ in { services.vaultwarden = { enable = true; backupDir = "/mnt/storage/backups/vaultwarden"; - config = { - ROCKET_ADDRESS = "::1"; - ROCKET_PORT = 8222; - }; }; services.nginx.virtualHosts.${domain} = { forceSSL = true;