diff --git a/flake.lock b/flake.lock index 1bc8f1c..23a3922 100644 --- a/flake.lock +++ b/flake.lock @@ -167,7 +167,7 @@ "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "revCount": 69, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz?rev=ff81ac966bb2cae68946d5ed5fc4994f96d0ffec&revCount=69" }, "original": { "type": "tarball", @@ -266,7 +266,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -284,7 +284,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -451,11 +451,11 @@ ] }, "locked": { - "lastModified": 1748182899, - "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=", + "lastModified": 1748489961, + "narHash": "sha256-uGnudxMoQi2c8rpPoHXuQSm80NBqlOiNF4xdT3hhzLM=", "owner": "nix-community", "repo": "home-manager", - "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160", + "rev": "95c988cf08e9a5a8fe7cc275d5e3f24e9e87bd51", "type": "github" }, "original": { @@ -509,11 +509,11 @@ }, "mnw": { "locked": { - "lastModified": 1747499976, - "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=", + "lastModified": 1748278309, + "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", "owner": "Gerg-L", "repo": "mnw", - "rev": "72433a144c4ac16931e9148f78db4a0e4c147441", + "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", "type": "github" }, "original": { @@ -587,16 +587,14 @@ "nixcord": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_3", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1748137719, - "narHash": "sha256-yBiIy+eb0QxYoIOzOY7QyjqXY5PiLgIoNbFtg4SbUH8=", + "lastModified": 1748457463, + "narHash": "sha256-y8PPlVQOcWpMBYP7YOM69ua163hjiABJY+QynKIjTXs=", "owner": "kaylorben", "repo": "nixcord", - "rev": "c4d7ccc9ae9fc1c46820bdc5b800b4f66e972ccc", + "rev": "b3e71cd6aa3534017f46e3cd2dba700be688ddb4", "type": "github" }, "original": { @@ -651,19 +649,19 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-torzu": { "locked": { - "lastModified": 1748124805, - "narHash": "sha256-8A7HjmnvCpDjmETrZY1QwzKunR63LiP7lHu1eA5q6JI=", + "lastModified": 1747156605, + "narHash": "sha256-sJdQ+R+SkuqwPODrJDTQymPdecEYQhB62cApdb/46r8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "db1aed32009f408e4048c1dd0beaf714dd34ed93", + "rev": "d9afddcd04bc716d1fee5141f8696a131f76442c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05-small", "repo": "nixpkgs", + "rev": "d9afddcd04bc716d1fee5141f8696a131f76442c", "type": "github" } }, @@ -685,27 +683,27 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1744868846, - "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "type": "github" }, "original": { @@ -770,7 +768,7 @@ "stylix", "nixpkgs" ], - "treefmt-nix": "treefmt-nix_2" + "treefmt-nix": "treefmt-nix" }, "locked": { "lastModified": 1746056780, @@ -795,14 +793,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_4" }, "locked": { - "lastModified": 1747525582, - "narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=", + "lastModified": 1749033605, + "narHash": "sha256-OkrBJNnD9/Qe2tn3/21rjbiVLlRvaNMdqzfFqUkpbHo=", "owner": "notashelf", "repo": "nvf", - "rev": "d3a0e7029ac57eef1120225973247851c5b967b5", + "rev": "cb4d8340a172e95069b05f8e62f1c93e9ded859b", "type": "github" }, "original": { @@ -821,7 +819,7 @@ "hm": "hm", "nixcord": "nixcord", "nixpkgs": "nixpkgs_4", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-torzu": "nixpkgs-torzu", "nvf": "nvf", "somcli": "somcli", "stylix": "stylix" @@ -883,7 +881,7 @@ "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_7", "nur": "nur", - "systems": "systems_7", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -891,11 +889,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748028561, - "narHash": "sha256-IgtJU6n9vR3nBUdcXrc7K9E+Y/G/4P6hFifGRr1tXMU=", + "lastModified": 1748450356, + "narHash": "sha256-r4ftEbA22jCoLnaB0w58wo5Pp8jgSGwwAEfGgvZGFcs=", "owner": "danth", "repo": "stylix", - "rev": "34b5930894d8315401d93bd8a9a6635e1cd28eff", + "rev": "257939576384a9057a8259e76689090643f5a127", "type": "github" }, "original": { @@ -944,8 +942,9 @@ "type": "github" }, "original": { - "id": "systems", - "type": "indirect" + "owner": "nix-systems", + "repo": "default", + "type": "github" } }, "systems_4": { @@ -993,21 +992,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1090,27 +1074,6 @@ } }, "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixcord", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744961264, - "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "8d404a69efe76146368885110f29a2ca3700bee6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { "inputs": { "nixpkgs": [ "stylix", diff --git a/flake.nix b/flake.nix index 4010b77..646e398 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ inputs = { # Nixpkgs and other core shit nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # build error unrelated to config. - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05-small"; # build error unrelated to config. + nixpkgs-torzu.url = "github:nixos/nixpkgs/d9afddcd04bc716d1fee5141f8696a131f76442c"; # Commit before packacge removed. flake-parts.url = "github:hercules-ci/flake-parts"; git-hooks-nix = { url = "github:cachix/git-hooks.nix"; diff --git a/home/programs/firefox.nix b/home/programs/firefox.nix index 02fbd88..533b82d 100644 --- a/home/programs/firefox.nix +++ b/home/programs/firefox.nix @@ -57,6 +57,7 @@ in { "vimium-c@gdh1995.cn".install_url = "https://addons.mozilla.org/firefox/downloads/latest/vimium-c/latest.xpi"; # Extension info here. "ff2mpv@yossarian.net".install_url = "https://addons.mozilla.org/firefox/downloads/latest/ff2mpv/latest.xpi"; "newtaboverride@agenedia.com".install_url = "https://addons.mozilla.org/firefox/downloads/latest/new-tab-override/latest.xpi"; + "{34daeb50-c2d2-4f14-886a-7160b24d66a4}".install_url = "https://addons.mozilla.org/firefox/downloads/latest/youtube-shorts-block/latest.xpi"; }; }; }; diff --git a/home/programs/games.nix b/home/programs/games.nix index 3b23e47..ad099da 100644 --- a/home/programs/games.nix +++ b/home/programs/games.nix @@ -1,6 +1,7 @@ { pkgs, osConfig, + inputs, lib, ... }: let @@ -9,7 +10,7 @@ in { # Also look at system/programs/games.nix (some programs have to be overlayed or have systemwide modules that have to be installed.) home.packages = lib.mkIf games ([ pkgs.dolphin-emu - pkgs.ryubing + inputs.nixpkgs-torzu.legacyPackages.${pkgs.system}.torzu pkgs.gale pkgs.adwsteamgtk diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix index 1d0197c..780994c 100644 --- a/home/programs/neovim.nix +++ b/home/programs/neovim.nix @@ -1,6 +1,6 @@ { - inputs, osConfig, + pkgs, ... }: { home.sessionVariables = {EDITOR = "nvim";}; @@ -39,6 +39,7 @@ clipboard = { enable = true; providers.wl-copy.enable = true; + registers = "unnamedplus"; }; binds = { whichKey.enable = true; @@ -71,6 +72,15 @@ hover = "gh"; codeAction = "."; }; + + # Emmet LSP. No option for this yet. https://github.com/NotAShelf/nvf/pull/867 + lspconfig.sources.emmet_language_server = '' + lspconfig.emmet_language_server.setup { + capabilities = capabilities, + on_attach = default_on_attach, + cmd = { "${pkgs.emmet-language-server}/bin/emmet-language-server", "--stdio" } + } + ''; }; autopairs.nvim-autopairs.enable = true; autocomplete.nvim-cmp.enable = true; diff --git a/home/wayland/hyprland/binds.nix b/home/wayland/hyprland/binds.nix index 0a74555..10c3fa0 100644 --- a/home/wayland/hyprland/binds.nix +++ b/home/wayland/hyprland/binds.nix @@ -107,10 +107,12 @@ in { ] ++ workspaces ++ lib.optionals games (let - ryubing = "${appE pkgs.ryubing} -ql"; + torzu = "${ + appE inputs.nixpkgs-torzu.legacyPackages.${pkgs.system}.torzu + } -ql"; dolphin = appE pkgs.dolphin-emu; in [ - "Super, s, exec, ${ryubing}" + "Super, s, exec, ${torzu}" "Super, d, exec, ${dolphin}" ]) ++ lib.optionals portable [ diff --git a/hosts/laptop/hardware-configuration.nix b/hosts/laptop/hardware-configuration.nix index 90ce2ea..c0376b5 100644 --- a/hosts/laptop/hardware-configuration.nix +++ b/hosts/laptop/hardware-configuration.nix @@ -13,26 +13,29 @@ ]; boot = { - initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod"]; - initrd.kernelModules = []; + initrd = { + availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "uas" "sd_mod"]; + kernelModules = []; + }; kernelModules = ["kvm-amd"]; extraModulePackages = []; }; fileSystems = { "/" = { - device = "/dev/disk/by-uuid/59540469-ecb9-4a68-829b-4cd3ad6e95c3"; + device = "/dev/disk/by-uuid/bc83e0e7-827b-4c6a-aba1-78d962823fd8"; fsType = "ext4"; }; "/boot" = { - device = "/dev/disk/by-uuid/83C9-84B1"; + device = "/dev/disk/by-uuid/7B53-942C"; fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; + options = ["fmask=0022" "dmask=0022"]; }; }; + swapDevices = [ - {device = "/dev/disk/by-uuid/65190d84-4e34-4905-a317-d750591933e2";} + {device = "/dev/disk/by-uuid/561528f9-b17c-493b-bc5d-1284a9a69cec";} ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -40,6 +43,9 @@ # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp195s0f3u1.useDHCP = lib.mkDefault true; + # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; + # networking.interfaces.virbr0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/system/core/boot.nix b/system/core/boot.nix index 0222ac6..05d7db6 100644 --- a/system/core/boot.nix +++ b/system/core/boot.nix @@ -28,7 +28,10 @@ in { loader = { # systemd-boot on UEFI efi.canTouchEfiVariables = true; - systemd-boot.enable = true; + systemd-boot = { + enable = true; + netbootxyz.enable = true; + }; timeout = 0; }; diff --git a/system/core/networking.nix b/system/core/networking.nix index 1e2eb93..141edeb 100644 --- a/system/core/networking.nix +++ b/system/core/networking.nix @@ -6,17 +6,17 @@ nameservers = ["9.9.9.9#dns.quad9.net"]; networkmanager = { enable = true; - dns = "systemd-resolved"; + # dns = "systemd-resolved"; wifi.powersave = true; }; }; users.groups.NetworkManager = {}; - services.resolved = { - # DNS resolver that tries to encrypt dns traffic - enable = true; - dnsovertls = "opportunistic"; - }; + # services.resolved = { + # # DNS resolver that tries to encrypt dns traffic + # enable = true; + # dnsovertls = "opportunistic"; + # }; systemd.services.NetworkManager-wait-online.enable = false; } diff --git a/system/server/matrix.nix b/system/server/matrix.nix index ba443f5..b3dcad5 100644 --- a/system/server/matrix.nix +++ b/system/server/matrix.nix @@ -21,6 +21,7 @@ in { server_name = host; allow_registration = true; registration_token_file = config.age.secrets.matrix-registration.path; + new_user_displayname_suffix = ""; }; };