diff options
| -rw-r--r-- | flake.lock | 140 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | home-manager/default.nix | 8 | ||||
| -rw-r--r-- | home-manager/home.nix | 4 | ||||
| -rw-r--r-- | machines/khad/default.nix | 6 | ||||
| -rw-r--r-- | machines/vm/foolcreek/default.nix | 22 | ||||
| -rw-r--r-- | machines/zenbook/default.nix | 6 | ||||
| -rw-r--r-- | modules/nixos/binary-cache.nix | 8 | ||||
| -rw-r--r-- | modules/nixos/hyprland.nix | 4 |
9 files changed, 115 insertions, 87 deletions
@@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1762356719, - "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", + "lastModified": 1764370710, + "narHash": "sha256-7iZklFmziy6Vn5ZFy9mvTSuFopp3kJNuPxL5QAvtmFQ=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", + "rev": "561ae7fbe1ca15dfd908262ec815bf21a13eef63", "type": "github" }, "original": { @@ -169,11 +169,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -293,16 +293,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -310,7 +310,7 @@ "hugo-congo": { "flake": false, "locked": { - "narHash": "sha256-2dyCZ+/p3lYMWr1MIQJSFxH2k/NsCNHxDWKAW0F7o7k=", + "narHash": "sha256-epq3PmdazrHHWBJPpuT/6P7zohTDbtpTX2PU/XesbgU=", "type": "file", "url": "https://github.com/jpanther/congo" }, @@ -364,11 +364,11 @@ ] }, "locked": { - "lastModified": 1762462052, - "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", + "lastModified": 1763733840, + "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", + "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", "type": "github" }, "original": { @@ -387,6 +387,7 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", "nixpkgs": [ "nixpkgs-unstable" ], @@ -395,11 +396,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1763819976, - "narHash": "sha256-W/893N/ifviI1PP1BVIwhYhstN8s5UOsi5lvaYupXhA=", + "lastModified": 1764956925, + "narHash": "sha256-EOcE188ewyfa0AAnX/BkfkCgYZcTdPA56c6MoKW9m2Q=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e584a8bade2617899d69ae6f83011d0c1d2a9df7", + "rev": "6a1daff5f30ea71e6d678554aa59fc5670864d24", "type": "github" }, "original": { @@ -441,11 +442,11 @@ ] }, "locked": { - "lastModified": 1762755186, - "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=", + "lastModified": 1764616927, + "narHash": "sha256-wRT0MKkpPo11ijSX3KeMN+EQWnpSeUlRtyF3pFLtlRU=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3", + "rev": "25cedbfdc5b3ea391d8307c9a5bea315e5df3c52", "type": "github" }, "original": { @@ -495,11 +496,11 @@ ] }, "locked": { - "lastModified": 1763254292, - "narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=", + "lastModified": 1764612430, + "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b", + "rev": "0d00dc118981531aa731150b6ea551ef037acddd", "type": "github" }, "original": { @@ -547,11 +548,11 @@ ] }, "locked": { - "lastModified": 1762463729, - "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "lastModified": 1764592794, + "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", "type": "github" }, "original": { @@ -572,11 +573,11 @@ ] }, "locked": { - "lastModified": 1763323331, - "narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=", + "lastModified": 1764637132, + "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0c6411851cc779d551edc89b83966696201611aa", + "rev": "2f2413801beee37303913fc3c964bbe92252a963", "type": "github" }, "original": { @@ -597,11 +598,11 @@ ] }, "locked": { - "lastModified": 1755184602, - "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "lastModified": 1763640274, + "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", "type": "github" }, "original": { @@ -610,6 +611,35 @@ "type": "github" } }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1764773840, + "narHash": "sha256-9UcCdwe7vPgEcJJ64JseBQL0ZJZoxp/2iFuvfRI+9zk=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "3f1997d6aeced318fb141810fded2255da811293", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -638,7 +668,7 @@ "narHash": "sha256-KYMUrTV7H/RR5/HRnjV5R3rRIuBXMemyJzTLi50NFTs=", "rev": "46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873.tar.gz?rev=46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873" }, "original": { "type": "tarball", @@ -670,11 +700,11 @@ "spectrum": "spectrum" }, "locked": { - "lastModified": 1763429621, - "narHash": "sha256-xJD3vjEdDP+/XKLgPAkaX44s2xuiAeOhCdjs2jrALY4=", + "lastModified": 1764625594, + "narHash": "sha256-RwtPzq4rqDCLki3oOLuUUkKcuaZPy4IDUBb5tAWl4Xk=", "owner": "astro", "repo": "microvm.nix", - "rev": "c4e4a264da114c618251b17eb4c959f86376e530", + "rev": "6dab9a797f262a352eed55078597582ed2ded336", "type": "github" }, "original": { @@ -766,11 +796,11 @@ ] }, "locked": { - "lastModified": 1751903740, - "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=", + "lastModified": 1764234087, + "narHash": "sha256-NHF7QWa0ZPT8hsJrvijREW3+nifmF2rTXgS2v0tpcEA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "032decf9db65efed428afd2fa39d80f7089085eb", + "rev": "032a1878682fafe829edfcf5fdfad635a2efe748", "type": "github" }, "original": { @@ -828,11 +858,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -860,16 +890,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -877,11 +907,11 @@ "nushell-scripts": { "flake": false, "locked": { - "lastModified": 1762863367, - "narHash": "sha256-oxnXzxQkNccCs36j+aMzg4QGHDcX7niJruqxCkeg0LM=", + "lastModified": 1764937069, + "narHash": "sha256-JZi2zDw72TW+Ak6+vDcRZZkmsqP7baV6ty+CagyfEKw=", "owner": "nushell", "repo": "nu_scripts", - "rev": "ff8092707054ad091d67bd408374a39977e33c1b", + "rev": "a4c2489c2efca00a780e99890ea8e30741c7e179", "type": "github" }, "original": { @@ -900,11 +930,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -944,11 +974,11 @@ ] }, "locked": { - "lastModified": 1763607916, - "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { @@ -2,11 +2,11 @@ description = "NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; # The `follows` keyword in inputs is used for inheritance. # Here, `inputs.nixpkgs` of home-manager isn't kept consistent with the `inputs.nixpkgs` of the current flake, # to not avoid problems caused by different versions of nixpkgs dependencies. diff --git a/home-manager/default.nix b/home-manager/default.nix index d528cfc..bba5525 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -106,10 +106,12 @@ git = { enable = true; - userName = "Devin Finlinson"; - userEmail = "devin.finlinson@pm.me"; includes = [{path = "~/.gitconfig.local";}]; - extraConfig = { + settings = { + user = { + name = "Devin Finlinson"; + email = "devin.finlinson@pm.me"; + }; core = { editor = "hx"; excludesfile = "~/.gitignore"; diff --git a/home-manager/home.nix b/home-manager/home.nix index 580a432..ea1c331 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -51,7 +51,7 @@ r2modman marble-marcher-ce prismlauncher - minetest + luanti firefox libreoffice # google-chrome @@ -64,7 +64,7 @@ # qutebrowser neofetch kdePackages.yakuake - qflipper + qFlipper cava helvum kdePackages.filelight diff --git a/machines/khad/default.nix b/machines/khad/default.nix index 0f3e32f..67a6f26 100644 --- a/machines/khad/default.nix +++ b/machines/khad/default.nix @@ -54,10 +54,6 @@ enable = true; enable32Bit = true; }; - amdgpu.amdvlk = { - enable = true; - support32Bit.enable = true; - }; }; environment.shellInit = ''export NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/khad/configuration.nix"''; @@ -125,7 +121,7 @@ android-tools adbfs-rootless xorg.xrandr - glxinfo + mesa-demos gpu-viewer hardinfo2 starsector diff --git a/machines/vm/foolcreek/default.nix b/machines/vm/foolcreek/default.nix index 624c6a7..ad3fc92 100644 --- a/machines/vm/foolcreek/default.nix +++ b/machines/vm/foolcreek/default.nix @@ -26,23 +26,23 @@ # }; # }; microvm = { - forwardPorts = [ # forward local port 2222-> 22, to ssh into the VM - { from = "host"; host.port = 2222; guest.port = 22; } + # forwardPorts = [ # forward local port 2222-> 22, to ssh into the VM + # { from = "host"; host.port = 2222; guest.port = 22; } - # forward local port 80 -> 10.1.11.100:80 in the VLAN - { from = "guest"; host.port = 8080; guest.port = 80; # website - # guest.address = "10.1.11.101"; guest.port = 80; - # host.address = "127.0.0.1"; host.port = 80; - } - ]; - interfaces =[ + # # forward local port 80 -> 10.1.11.100:80 in the VLAN + # { from = "guest"; host.port = 8080; guest.port = 80; # website + # # guest.address = "10.1.11.101"; guest.port = 80; + # # host.address = "127.0.0.1"; host.port = 80; + # } + # ]; + # interfaces =[ # { # type = "tap"; # id = "vm-foolcreek"; # mac = "02:00:00:00:00:01"; # } - { type = "user"; } - ]; + # { type = "user"; } + # ]; }; systemd.network = { diff --git a/machines/zenbook/default.nix b/machines/zenbook/default.nix index 7edf9d2..8352802 100644 --- a/machines/zenbook/default.nix +++ b/machines/zenbook/default.nix @@ -152,9 +152,9 @@ # enable the OpenSSH daemon services.openssh.enable = true; - services.udev.packages = [ # for flashing calyxos - pkgs.android-udev-rules - ]; + # services.udev.packages = [ # for flashing calyxos + # pkgs.android-udev-rules + # ]; # Copy the NixOS configuration file and link it from the resulting system # (/run/current-system/configuration.nix). This is useful in case you diff --git a/modules/nixos/binary-cache.nix b/modules/nixos/binary-cache.nix index 609a5dc..c0aa087 100644 --- a/modules/nixos/binary-cache.nix +++ b/modules/nixos/binary-cache.nix @@ -1,8 +1,8 @@ {config, ... }: { - services.nix-serve = { - enable = true; - secretKeyFile = "/var/secrets/cache-private-key.pem"; - }; + # services.nix-serve = { + # enable = true; + # secretKeyFile = "/var/secrets/cache-private-key.pem"; + # }; services.nginx = { enable = true; diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 4a446c1..0abf02d 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -75,7 +75,7 @@ hyprpicker # color picker wf-recorder # screen recording - kdePackages.xwaylandvideobridge # lets xwayland programs see wayland applications for screensharing + # kdePackages.xwaylandvideobridge # lets xwayland programs see wayland applications for screensharing grim # taking screenshots slurp # selecting a region to screenshot # TODO replace by 'flameshot gui --raw | wl-copy' @@ -88,7 +88,7 @@ # audio alsa-utils # provides amixer/alsamixer/... mpd # for playing system sounds - mpc-cli # command-line pmd client + mpc # command-line pmd client ncmpcpp # a mpd client with a UI networkmanagerapplet # provide GUI app: nm-connection-editor |