diff --git a/flake.nix b/flake.nix index 769653a..f9bc7d6 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "NixOS configuration for legolas (laptop)"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -17,7 +17,7 @@ nix-colors.url = "github:misterio77/nix-colors"; stylix = { - url = "github:nix-community/stylix/release-25.11"; + url = "github:nix-community/stylix/master"; # TODO: update to release-26.05 when available inputs.nixpkgs.follows = "nixpkgs"; }; @@ -34,7 +34,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixvim = { - url = "github:nix-community/nixvim/nixos-25.11"; + url = "github:nix-community/nixvim/nixos-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/applications.nix b/home/applications.nix index cc77eed..aa8fedc 100644 --- a/home/applications.nix +++ b/home/applications.nix @@ -2,8 +2,8 @@ { home.packages = with pkgs; [ - element-desktop - discord + fluffychat + vesktop firefox nautilus gimp @@ -13,10 +13,8 @@ kdePackages.okular sweethome3d.application audacity - bitwarden-desktop + rbw openvpn - zettlr - logseq pandoc typst texliveMedium diff --git a/home/opencode.nix b/home/opencode.nix index 8b0f45d..f33fcbc 100644 --- a/home/opencode.nix +++ b/home/opencode.nix @@ -29,7 +29,7 @@ ''; }; - rules = '' + context = '' ### **General Project Guidelines** #### **Separation of Concerns** diff --git a/home/sshconfig.nix b/home/sshconfig.nix index 9537176..911dab3 100644 --- a/home/sshconfig.nix +++ b/home/sshconfig.nix @@ -17,11 +17,9 @@ programs.ssh = { enable = true; - # compression moved to matchBlocks."*" - # Default config is deprecated, disabling it and managing defaults manually if needed enableDefaultConfig = false; - matchBlocks = { + settings = { "*" = { compression = true; identityFile = [ @@ -49,18 +47,14 @@ "garp.pbsds.net" = { user = "adrlau"; proxyJump = "login.pvv.ntnu.no"; - extraOptions = { - StrictHostKeyChecking = "no"; - UserKnownHostsFile = "/dev/null"; - }; + StrictHostKeyChecking = "no"; + UserKnownHostsFile = "/dev/null"; }; "bolle.pbsds.net" = { user = "adrlau"; proxyJump = "login.pvv.ntnu.no"; - extraOptions = { - StrictHostKeyChecking = "no"; - UserKnownHostsFile = "/dev/null"; - }; + StrictHostKeyChecking = "no"; + UserKnownHostsFile = "/dev/null"; }; #pvv diff --git a/home/stylix.nix b/home/stylix.nix index 76aec67..c3aa662 100644 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -1,6 +1,8 @@ { pkgs, config, ... }: { + gtk.gtk4.theme = config.gtk.theme; + stylix = { enable = true; diff --git a/home/swww.nix b/home/swww.nix index 1479e69..95f6599 100644 --- a/home/swww.nix +++ b/home/swww.nix @@ -4,5 +4,5 @@ let palette = config.colorscheme.palette; in { - services.swww.enable = true; + services.awww.enable = true; } diff --git a/modules/basePackages.nix b/modules/basePackages.nix index a78e93b..a0341d1 100644 --- a/modules/basePackages.nix +++ b/modules/basePackages.nix @@ -11,7 +11,7 @@ bottom nvtopPackages.full uutils-coreutils - nixfmt-rfc-style + nixfmt nixfmt-tree zip diff --git a/modules/develPackages.nix b/modules/develPackages.nix index 2285e70..c0004eb 100644 --- a/modules/develPackages.nix +++ b/modules/develPackages.nix @@ -42,7 +42,6 @@ yarn nodejs-slim - node2nix uv thonny diff --git a/modules/nix.nix b/modules/nix.nix index f956c1d..f3092f6 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -8,8 +8,6 @@ { imports = [ ./nixpkgs.nix ]; # migrate this afterwards. - system.rebuild.enableNg = true; - sops.secrets."github/api" = { mode = "0444"; group = "root";