diff --git a/flake.lock b/flake.lock index 0f2a0dd..e3105b6 100755 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1759509947, - "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=", + "lastModified": 1762912391, + "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355", + "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126", "type": "github" }, "original": { @@ -49,11 +49,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1762276996, - "narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=", + "lastModified": 1764350888, + "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", "owner": "nix-community", "repo": "disko", - "rev": "af087d076d3860760b3323f6b583f4d828c1ac17", + "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1762747412, - "narHash": "sha256-E9E30aYXUvRrsBG03cDnQnjGpFgfoct55BuPpAGzfEE=", + "lastModified": 1764475519, + "narHash": "sha256-12TAT2CD+L+wdIHszQnPyu8zGSBxcazoVZmP6UQjk6s=", "owner": "rycee", "repo": "nur-expressions", - "rev": "09deac38ec607361200ed0d88e77b50b00426f0f", + "rev": "1172c39fb0e847a7f036e480d94f629edcf2cf46", "type": "gitlab" }, "original": { @@ -159,16 +159,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764536451, + "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -196,11 +196,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": { @@ -227,11 +227,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762596750, - "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -243,16 +243,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762756533, - "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", + "lastModified": 1764494334, + "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", + "rev": "d542db745310b6929708d9abea513f3ff19b1341", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1762659808, - "narHash": "sha256-2Kv2mANf+FRisqhpfeZ8j9firBxb23ZvEXwdcunbpGI=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "Mic92", "repo": "sops-nix", - "rev": "524312bc62e3f34bd9231a2f66622663d3355133", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c2151d6..6e0a085 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "NixOS Hosts"; 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"; disko.url = "github:nix-community/disko"; snowfall-lib = { @@ -10,7 +10,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; apple-silicon = { diff --git a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix index 7390a09..22075b9 100755 --- a/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix +++ b/homes/x86_64-linux/evanreichard@lin-va-thinkpad/default.nix @@ -49,10 +49,6 @@ in }; }; - home.packages = with pkgs; [ - jellyfin-media-player - ]; - dconf = { settings = { "org/gnome/desktop/interface" = { diff --git a/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf b/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf index 6c700fe..38a21cc 100755 --- a/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf +++ b/modules/home/programs/graphical/wms/hyprland/config/hyprland.conf @@ -127,11 +127,7 @@ input { } # https://wiki.hyprland.org/Configuring/Variables/#gestures -gestures { - workspace_swipe = true - workspace_swipe_fingers = 4 - workspace_swipe_invert = true -} +gesture = 4, horizontal, workspace, invert # Thinkpad Trackpoint device { diff --git a/modules/home/programs/terminal/bash/default.nix b/modules/home/programs/terminal/bash/default.nix index 0e1a4fb..9ea5677 100755 --- a/modules/home/programs/terminal/bash/default.nix +++ b/modules/home/programs/terminal/bash/default.nix @@ -29,7 +29,6 @@ in EDITOR="$VISUAL" fastfetch - eval "$(thefuck --alias)" ''; }; @@ -58,7 +57,6 @@ in }; home.packages = with pkgs; [ - thefuck fastfetch bashInteractive nerd-fonts.meslo-lg diff --git a/modules/home/programs/terminal/git/default.nix b/modules/home/programs/terminal/git/default.nix index edac2e8..cebc7d8 100755 --- a/modules/home/programs/terminal/git/default.nix +++ b/modules/home/programs/terminal/git/default.nix @@ -11,22 +11,12 @@ in config = mkIf cfg.enable { programs.git = { enable = true; - userName = "Evan Reichard"; - aliases = { - lg = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all -n 15"; - }; - includes = [ - { - path = "~/.config/git/work"; - condition = "gitdir:~/Development/git/work/"; - } - { - path = "~/.config/git/personal"; - condition = "gitdir:~/Development/git/personal/"; - } - ]; - extraConfig = { + settings = { + aliases = { + lg = "log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all -n 15"; + }; user = { + name = "Evan Reichard"; email = "evan@reichard.io"; }; core = { @@ -73,6 +63,16 @@ in autoSetupRemote = true; }; }; + includes = [ + { + path = "~/.config/git/work"; + condition = "gitdir:~/Development/git/work/"; + } + { + path = "~/.config/git/personal"; + condition = "gitdir:~/Development/git/personal/"; + } + ]; }; programs.gh = { @@ -83,7 +83,7 @@ in }; home.packages = with pkgs; [ - gitAndTools.gh + gh pre-commit ]; diff --git a/modules/nixos/display-managers/sddm/default.nix b/modules/nixos/display-managers/sddm/default.nix index 0eab472..1d60ffe 100644 --- a/modules/nixos/display-managers/sddm/default.nix +++ b/modules/nixos/display-managers/sddm/default.nix @@ -17,7 +17,8 @@ in sddm = { inherit (cfg) enable; package = pkgs.kdePackages.sddm; - theme = "catppuccin-mocha"; + #theme = "catppuccin-mocha"; # https://github.com/nixos/nixpkgs/issues/434963 + theme = "breeze"; wayland.enable = true; }; }; diff --git a/modules/nixos/virtualisation/libvirtd/default.nix b/modules/nixos/virtualisation/libvirtd/default.nix index 9d716b4..6474204 100644 --- a/modules/nixos/virtualisation/libvirtd/default.nix +++ b/modules/nixos/virtualisation/libvirtd/default.nix @@ -15,7 +15,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - win-virtio + virtio-win virtiofsd libvirt qemu_kvm @@ -40,10 +40,6 @@ in package = pkgs.qemu_kvm; runAsRoot = false; swtpm.enable = true; - ovmf = { - enable = true; - packages = [ pkgs.OVMFFull.fd ]; - }; }; };