diff --git a/features-nixos/optional/openssh.nix b/features-nixos/optional/openssh.nix index 4e6b738..843570e 100644 --- a/features-nixos/optional/openssh.nix +++ b/features-nixos/optional/openssh.nix @@ -15,7 +15,7 @@ in { # TODO: what does this do # Let WAYLAND_DISPLAY be forwarded - AcceptEnv = "WAYLAND_DISPLAY"; + # AcceptEnv = "WAYLAND_DISPLAY"; X11Forwarding = true; }; diff --git a/flake.lock b/flake.lock index 163119c..cfdbd8d 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "base16-schemes": { - "flake": false, - "locked": { - "lastModified": 1696158499, - "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", - "owner": "tinted-theming", - "repo": "base16-schemes", - "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-schemes", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1736101677, @@ -58,11 +42,11 @@ ] }, "locked": { - "lastModified": 1778958912, - "narHash": "sha256-6pvS9rIF9mZRj1ENwu9fDLHeG1JFDTCpRyy6vJhXkTA=", + "lastModified": 1780290312, + "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=", "owner": "nix-community", "repo": "disko", - "rev": "6e8dc7aa0e65fce67c76e18227a13a7d529f2cdf", + "rev": "115e5211780054d8a890b41f0b7734cafad54dfe", "type": "github" }, "original": { @@ -111,11 +95,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -162,25 +146,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -203,16 +169,16 @@ ] }, "locked": { - "lastModified": 1778905220, - "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=", + "lastModified": 1780341248, + "narHash": "sha256-PPWavrpeQFqE3bEShp9xcWeh2xyVbUucjBbG64MLRl0=", "owner": "nix-community", "repo": "home-manager", - "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb", + "rev": "4baa8ac595f6122d2899093f575347af9c4e66d7", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -257,34 +223,6 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1754860581, - "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.1.1", - "repo": "ixx", - "type": "github" - } - }, "music-reader": { "inputs": { "flake-utils": "flake-utils", @@ -326,25 +264,6 @@ "type": "github" } }, - "nix-colors": { - "inputs": { - "base16-schemes": "base16-schemes", - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1707825078, - "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", - "owner": "misterio77", - "repo": "nix-colors", - "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", - "type": "github" - }, - "original": { - "owner": "misterio77", - "repo": "nix-colors", - "type": "github" - } - }, "nix-gl": { "inputs": { "flake-utils": "flake-utils_2", @@ -373,11 +292,11 @@ ] }, "locked": { - "lastModified": 1778999127, - "narHash": "sha256-V5GquqJvAqwFTcpN6hxKSQAtwuJFRUEHmyNKbeaTQDg=", + "lastModified": 1780210899, + "narHash": "sha256-4axz3OBPTKa6LIkXV8n0lc63MQU+et2CB5DGobEAi6k=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f680e0d3c1dbefe298c423691662e238496890f2", + "rev": "97df9dc0b7c924344b793a15c1e8e4522ebb854e", "type": "github" }, "original": { @@ -444,12 +363,15 @@ } }, "nixos-hardware": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, "locked": { - "lastModified": 1778945272, - "narHash": "sha256-Aipz0UiBhE2a1FYJrNc2y+5vKWo5QVkhmaIJk3/ls+g=", + "lastModified": 1780310866, + "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "379c1f274f0fa354d012f0600806de54e79f29b5", + "rev": "4ed851c979641e28597a05086332d75cdc9e395f", "type": "github" }, "original": { @@ -474,28 +396,13 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1697935651, - "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { @@ -535,16 +442,29 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1778737229, - "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", + "lastModified": 1767892417, + "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1780203844, + "narHash": "sha256-K5sT4jTpGs15ADhviMKNBH38REpPf5Q6mM1+N6cArVE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", + "rev": "b51242d7d43689db2f3be91bd05d5b24fbb469c4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -555,47 +475,23 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_5" + "systems": "systems_4" }, "locked": { - "lastModified": 1769049374, - "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", + "lastModified": 1780214453, + "narHash": "sha256-Bfq9y0X6Vs4UPb67u7hN3jt7fJKHtl3+g0lBSDebRNg=", "owner": "nix-community", "repo": "nixvim", - "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", + "rev": "167da56c3ab1e51751a6ae4a997ed66587f9edae", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixvim", "type": "github" } }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_3", - "ixx": "ixx", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1768249818, - "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", - "owner": "NuschtOS", - "repo": "search", - "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "deploy-rs": "deploy-rs", @@ -603,25 +499,24 @@ "home-manager": "home-manager", "impermanence": "impermanence", "music-reader": "music-reader", - "nix-colors": "nix-colors", "nix-gl": "nix-gl", "nix-index-database": "nix-index-database", "nix-matlab": "nix-matlab", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "sheet-organizer": "sheet-organizer", "sops-nix": "sops-nix", - "systems": "systems_7", + "systems": "systems_6", "yazi-flavors": "yazi-flavors" } }, "sheet-organizer": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] @@ -736,21 +631,6 @@ } }, "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -786,11 +666,11 @@ "yazi-flavors": { "flake": false, "locked": { - "lastModified": 1778937272, - "narHash": "sha256-46x4K4dx4rlU108SXhctJOeGlO/W57Pnofb914Sa4vA=", + "lastModified": 1780204176, + "narHash": "sha256-qWNArjWuxWL+rOjLzyIniW5hJgWiAWTCgXmMXJpaWZE=", "owner": "yazi-rs", "repo": "flavors", - "rev": "54ab389e4deb3d1bc1d8de18d99e825962a55da1", + "rev": "0f9204bc948c8313963f5c9d571a82edc201f8aa", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 74af966..35f2afb 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,10 @@ inputs = { nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; systems.url = "github:nix-systems/default-linux"; nixos-hardware.url = "github:nixos/nixos-hardware"; impermanence.url = "github:nix-community/impermanence"; - nix-colors.url = "github:misterio77/nix-colors"; deploy-rs.url = "github:serokell/deploy-rs"; nixos-generators = { @@ -16,7 +15,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-index-database = { @@ -42,7 +41,7 @@ flake = false; }; nixvim = { - url = "github:nix-community/nixvim/nixos-25.11"; + url = "github:nix-community/nixvim/nixos-26.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nix-matlab = { diff --git a/homes/julian/features/gtk/default.nix b/homes/julian/features/gtk/default.nix index 0d2f0ad..5953c39 100644 --- a/homes/julian/features/gtk/default.nix +++ b/homes/julian/features/gtk/default.nix @@ -1,23 +1,11 @@ -{ - config, - pkgs, - inputs, - ... -}: let - inherit (inputs.nix-colors.lib-contrib {inherit pkgs;}) gtkThemeFromScheme; -in { - # Do not make conditional, just toggle things on and off - imports = [inputs.nix-colors.homeManagerModules.default]; # TODO: what does this do - - # home.sessionVariables.GTK_THEME = "Catppuccin-Mocha-Compact-Blue-dark"; - gtk = { +{pkgs, ...}: { + gtk = rec { enable = true; theme = { - name = inputs.nix-colors.colorschemes.${config.colorscheme.name}.slug; - package = gtkThemeFromScheme { - scheme = inputs.nix-colors.colorschemes.${config.colorscheme.name}; - }; + name = "Catppuccin"; + package = pkgs.catppuccin-gtk; }; + gtk4.theme = theme; iconTheme = { name = "Papirus-Dark"; package = pkgs.papirus-icon-theme; diff --git a/homes/julian/features/hyprland/default.nix b/homes/julian/features/hyprland/default.nix index f616da4..7aea0e5 100644 --- a/homes/julian/features/hyprland/default.nix +++ b/homes/julian/features/hyprland/default.nix @@ -4,12 +4,7 @@ config, lib, ... -}: let - inherit - (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name}) - palette - ; -in { +}: { imports = [ # inputs.hyprland.homeManagerModules.default ./waybar @@ -119,6 +114,8 @@ in { # } # ); + configType = "lua"; + systemd = { enable = true; # Same as default, but stop graphical-session too diff --git a/homes/julian/features/yazi/default.nix b/homes/julian/features/yazi/default.nix index e94bc18..016eae1 100644 --- a/homes/julian/features/yazi/default.nix +++ b/homes/julian/features/yazi/default.nix @@ -16,11 +16,8 @@ xclip ]; - home.shellAliases = { - y = "yy"; # Yazi shell wrapper (cd on quit) - }; - programs.yazi.enable = true; + programs.yazi.shellWrapperName = "y"; programs.yazi.enableFishIntegration = true; programs.yazi.settings.manager = { sort_by = "mtime"; diff --git a/packages/xwacomcalibrate/default.nix b/packages/xwacomcalibrate/default.nix index fff8a81..044f15a 100644 --- a/packages/xwacomcalibrate/default.nix +++ b/packages/xwacomcalibrate/default.nix @@ -1,7 +1,8 @@ { writeShellApplication, xf86_input_wacom, - xorg, + xwininfo, + xrandr, xdotool, bc, }: @@ -10,8 +11,8 @@ writeShellApplication { runtimeInputs = [ xf86_input_wacom - xorg.xwininfo - xorg.xrandr + xwininfo + xrandr xdotool bc ];