diff --git a/flake.lock b/flake.lock index b2e874f..5e9417a 100644 --- a/flake.lock +++ b/flake.lock @@ -21,17 +21,17 @@ "base16-fish": { "flake": false, "locked": { - "lastModified": 1754405784, - "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" }, "original": { "owner": "tomyun", "repo": "base16-fish", - "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", "type": "github" } }, @@ -79,11 +79,11 @@ ] }, "locked": { - "lastModified": 1765210039, - "narHash": "sha256-7nzwLyKSW/+9LHsk5TjELy+vT1r7H9mpyFW2KOqFf9U=", + "lastModified": 1765831383, + "narHash": "sha256-P5F/VPjjGw7s0AOTPb3z3gxqtH0YkAnd/c9P6QdWrEU=", "owner": "HeitorAugustoLN", "repo": "cosmic-manager", - "rev": "d30d013b603ad79c45fb3cfa3f26a7dec06849e0", + "rev": "819d4d21fb90460dd11416d81d2cff65a53b8a59", "type": "github" }, "original": { @@ -137,11 +137,11 @@ ] }, "locked": { - "lastModified": 1765495779, - "narHash": "sha256-MhA7wmo/7uogLxiewwRRmIax70g6q1U/YemqTGoFHlM=", + "lastModified": 1765835352, + "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "5635c32d666a59ec9a55cab87e898889869f7b71", + "rev": "a34fae9c08a15ad73f295041fec82323541400a9", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1765605144, - "narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=", + "lastModified": 1767514898, + "narHash": "sha256-ONYqnKrPzfKEEPChoJ9qPcfvBqW9ZgieDKD7UezWPg4=", "owner": "nix-community", "repo": "home-manager", - "rev": "90b62096f099b73043a747348c11dbfcfbdea949", + "rev": "7a06e8a2f844e128d3b210a000a62716b6040b7f", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1764554060, - "narHash": "sha256-vewrwjGqublgja1bvlIybRnlltKHLNlnP7WYDg+9h1Y=", + "lastModified": 1767232402, + "narHash": "sha256-li+h6crnhc5Zqs+M6pn7D7M0W9M63ECNennDjRgzioE=", "owner": "musnix", "repo": "musnix", - "rev": "599562080b2901046829ca69e0d1461041d27b32", + "rev": "d65f98e0b1f792365f1705653d7b2d266ceeff6e", "type": "github" }, "original": { @@ -303,11 +303,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765786620, - "narHash": "sha256-MPgXA3vfeUclJAt1r1LfH6TXmcqDEJm3HVDjr4Y1fIs=", + "lastModified": 1767544157, + "narHash": "sha256-DVTMOUd4uHkDcZXWAqOS+Pa0M9a27G1Ya3B7SFG6BQs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "97440574d71b235b601013edf4749397b1ce99a6", + "rev": "d0e2c4bebf9d0b879410736f7abce628976bfb92", "type": "github" }, "original": { @@ -336,11 +336,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1765687800, - "narHash": "sha256-Erk+ypR8N+rCvjMdUB1N/v4jtm4QRH9k7r/9zh2HyC8=", + "lastModified": 1767530622, + "narHash": "sha256-ywnL1cc0A6fni7m859ImiBYA8DlXXJ+5OXIlcBqJ2B0=", "owner": "YaLTeR", "repo": "niri", - "rev": "7c0898570ca5bd3f10fbf4cf2f8a00edc48d787b", + "rev": "54c2e2ab476629d17fdba861895f58e7cdac32ab", "type": "github" }, "original": { @@ -351,11 +351,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -367,11 +367,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1765762245, - "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", + "lastModified": 1767480499, + "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", + "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", "type": "github" }, "original": { @@ -383,11 +383,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1765762245, - "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", + "lastModified": 1767480499, + "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", + "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -422,11 +422,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1765796859, - "narHash": "sha256-c2YaJUsLGk3WNqIHIU/Pt1fGjNH02ePsHfD5MJlfEe4=", + "lastModified": 1767448089, + "narHash": "sha256-U1fHsZBnFrUil731NHD9Sg5HoiG+eSHau8OFuClhwW0=", "owner": "nix-community", "repo": "nixvim", - "rev": "d8c9d8451d4592dd7de647230f407d4d6370bd8e", + "rev": "983751b66f255bbea1adc185364e9e7b73f82358", "type": "github" }, "original": { @@ -504,11 +504,11 @@ ] }, "locked": { - "lastModified": 1765684837, - "narHash": "sha256-fJCnsYcpQxxy/wit9EBOK33c0Z9U4D3Tvo3gf2mvHos=", + "lastModified": 1767499857, + "narHash": "sha256-0zUU/PW09d6oBaR8x8vMHcAhg1MOvo3CwoXgHijzzNE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "94d8af61d8a603d33d1ed3500a33fcf35ae7d3bc", + "rev": "ecc41505948ec2ab0325f14c9862a4329c2b4190", "type": "github" }, "original": { @@ -538,11 +538,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765802640, - "narHash": "sha256-rLGl6MaC4pwGcLJ14sfFb8r5rbvWb6ZRTfztcLJHwIU=", + "lastModified": 1766603740, + "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=", "owner": "danth", "repo": "stylix", - "rev": "4e63fa32d8beefd2f222181e8ca8d41eb9a7e153", + "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0", "type": "github" }, "original": { @@ -698,11 +698,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1765343581, - "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", + "lastModified": 1766429945, + "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", + "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", "type": "github" }, "original": { @@ -716,11 +716,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1765772419, - "narHash": "sha256-1mQ1K4fqebT54nz13rcRNjd6a+IbNLwLvYyR62EcyE8=", + "lastModified": 1767307876, + "narHash": "sha256-d5EKvUnfr6tdhymIThz0WGG0JHT2cCZzbZK4t2CwYuc=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "227e836e43fe7985b4c4f8b0076446a6d66f3343", + "rev": "c5bffaf433e6137fe80cd1930584836f11119b26", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7b621c3..1857f36 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ zenix = mkConf { nixos-modules = [ ./hardware/zenix.nix - ./nixos/programs/niri.nix + ./nixos/programs/hyprland.nix ./nixos/programs/gamer.nix ./nixos/programs/personal.nix ./nixos/services/musnix.nix diff --git a/hardware/framework-13.nix b/hardware/framework-13.nix index dd70137..50f4e12 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 daba723..4c8da19 100644 --- a/hardware/zenix.nix +++ b/hardware/zenix.nix @@ -68,10 +68,6 @@ hardware.amdgpu = { opencl.enable = true; - amdvlk = { - enable = true; - support32Bit.enable = true; - }; }; networking.hostName = "zenix"; @@ -85,26 +81,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 81efc71..2bb165c 100644 --- a/home/desktop/hyprland/default.nix +++ b/home/desktop/hyprland/default.nix @@ -33,11 +33,10 @@ in { scroll_factor = 0.5; }; kb_options = lib.mkDefault "caps:escape"; - kb_layout = lib.mkDefault "gb"; + kb_layout = lib.mkDefault "us"; + kb_variant = lib.mkDefault "dvorak"; numlock_by_default = true; - }; - gestures = { - workspace_swipe = true; + accel_profile = "flat"; }; decoration = { rounding = 0; diff --git a/home/programs/gamer.nix b/home/programs/gamer.nix index e58aa94..99e8627 100644 --- a/home/programs/gamer.nix +++ b/home/programs/gamer.nix @@ -2,7 +2,7 @@ home.packages = with pkgs; [ # Games airshipper - minetest + luanti superTuxKart xonotic diff --git a/home/programs/graphical.nix b/home/programs/graphical.nix index c21ccd5..78b8460 100644 --- a/home/programs/graphical.nix +++ b/home/programs/graphical.nix @@ -67,12 +67,4 @@ ]; }; - 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 e1ec3a1..8d4c32d 100644 --- a/home/programs/personal/default.nix +++ b/home/programs/personal/default.nix @@ -38,7 +38,6 @@ krita organicmaps anki - bookworm jellyfin-mpv-shim ]; } diff --git a/nixos/programs/gamer.nix b/nixos/programs/gamer.nix index e1ddbec..ffd64c0 100644 --- a/nixos/programs/gamer.nix +++ b/nixos/programs/gamer.nix @@ -1,4 +1,4 @@ -{...}: { +{pkgs, ...}: { allowUnfreePkgNames = [ "steam" "steam-unwrapped" @@ -27,4 +27,15 @@ 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 2a937b6..40f5cbd 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,4 +9,8 @@ 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 9c8497d..7499aca 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:0yzj1i4zbjy9cms75ip6ad8qyjgv9kka42gxsbzyzr2syznsmqw0"; + sha256 = "sha256:1lhhhzjm1rj25gg6dnmgwaxr05f8p2ndrlygdnjqzam7s6y75db3"; } ]; } diff --git a/nixos/services/prometheus.nix b/nixos/services/prometheus.nix index bae5c9f..fb29da9 100644 --- a/nixos/services/prometheus.nix +++ b/nixos/services/prometheus.nix @@ -3,7 +3,7 @@ nodes = [ "alpine" "100.106.49.128" # laptop - "100.65.29.110" # gaming pc + "100.78.76.10" # gaming pc ]; addPort = ip: "${ip}:${toString prometheus.exporters.node.port}"; in { @@ -68,11 +68,13 @@ 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 dddb0ef..907ebb5 100644 --- a/nixos/services/vaultwarden.nix +++ b/nixos/services/vaultwarden.nix @@ -5,6 +5,10 @@ in { services.vaultwarden = { enable = true; backupDir = "/mnt/storage/backups/vaultwarden"; + config = { + ROCKET_ADDRESS = "::1"; + ROCKET_PORT = 8222; + }; }; services.nginx.virtualHosts.${domain} = { forceSSL = true;