From 98db82fede521106efbb55af8d8a56a1b05b5af0 Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 15 Jul 2026 21:58:28 +0200 Subject: [PATCH 01/57] fix rebuild issues and add nice utils to system packages --- configuration.nix | 5 +++++ home/home.nix | 1 + stylix.nix | 2 ++ 3 files changed, 8 insertions(+) diff --git a/configuration.nix b/configuration.nix index 1a52d6f..2c66d29 100644 --- a/configuration.nix +++ b/configuration.nix @@ -160,6 +160,11 @@ kdePackages.isoimagewriter # Write hybrid ISOs to USB kdePackages.partitionmanager # Disk and partition management hardinfo2 # System benchmarks and hardware info + wl-clipboard + btop + ripgrep + fd + bat ]; hardware.bluetooth = { enable = true; diff --git a/home/home.nix b/home/home.nix index d8e09f6..e0c52c8 100644 --- a/home/home.nix +++ b/home/home.nix @@ -21,6 +21,7 @@ fastfetch hyfetch ]; + home.pointerCursor.enable = true; home.username = "lucy"; home.homeDirectory = "/home/lucy"; services.syncthing = { diff --git a/stylix.nix b/stylix.nix index 8a54320..afdcfe3 100644 --- a/stylix.nix +++ b/stylix.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: { @@ -30,6 +31,7 @@ console.enable = true; gtk.enable = true; qt.enable = true; + qt.platform = lib.mkForce "qtct"; nixvim.enable = true; }; fonts = { From 501af7ae72e11cecf48c310f2d0884b177f9630e Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 08:03:00 +0200 Subject: [PATCH 02/57] formatting and package changes --- configuration.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/configuration.nix b/configuration.nix index 2c66d29..3fc1334 100644 --- a/configuration.nix +++ b/configuration.nix @@ -100,15 +100,15 @@ (iosevka.override { set = "Custom"; privateBuildPlan = '' - [buildPlans.IosevkaCustom] + [buildPlans.IosevkaCustom] family = "Iosevka Custom" spacing = "fontconfig-mono" serifs = "slab" noCvSs = true exportGlyphNames = false - [buildPlans.IosevkaCustom.variants] - inherits = "ss12" + [buildPlans.IosevkaCustom.variants] + inherits = "ss12" [buildPlans.IosevkaCustom.weights.Regular] shape = 400 @@ -148,23 +148,17 @@ nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ - git - kdePackages.discover # Optional: Software center for Flatpaks/firmware updates kdePackages.kcalc # Calculator - kdePackages.kcharselect # Character map kdePackages.kclock # Clock app - kdePackages.kcolorchooser # Color picker - kdePackages.kolourpaint # Simple paint program - kdePackages.ksystemlog # System log viewer kdePackages.sddm-kcm # SDDM configuration module kdePackages.isoimagewriter # Write hybrid ISOs to USB - kdePackages.partitionmanager # Disk and partition management - hardinfo2 # System benchmarks and hardware info wl-clipboard btop ripgrep fd bat + grimblast + git ]; hardware.bluetooth = { enable = true; From c7186cb4a217fb32eca1d2c85ef34e65062d093d Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 08:23:34 +0200 Subject: [PATCH 03/57] add hyprland to flake --- configuration.nix | 4 + flake.lock | 535 ++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 1 + home/hyprland.nix | 8 + 4 files changed, 512 insertions(+), 36 deletions(-) create mode 100644 home/hyprland.nix diff --git a/configuration.nix b/configuration.nix index 3fc1334..fbca7ec 100644 --- a/configuration.nix +++ b/configuration.nix @@ -19,6 +19,10 @@ ]; nix.package = pkgs.lixPackageSets.stable.lix; nix.settings.trusted-users = [ "lucy" ]; + nix.settings = { + substituters = [ "https://hyprland.cachix.org" ]; + trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; + }; networking.hostName = "nixos"; # Define your hostname. networking.networkmanager.enable = true; networking.networkmanager.wifi.powersave = false; diff --git a/flake.lock b/flake.lock index 7bf4de6..3777f8b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1782073106, + "narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -116,6 +149,22 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -191,7 +240,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -269,11 +318,11 @@ ] }, "locked": { - "lastModified": 1783823409, - "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", + "lastModified": 1784129366, + "narHash": "sha256-N5JiyICSeQF14x+OQebNyPpYowOT9Rs1iKyeCylSzOA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", + "rev": "165228b0efefc3e635e5174020c40ea64271dc25", "type": "github" }, "original": { @@ -282,6 +331,325 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1776511930, + "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "39435900785d0c560c6ae8777d29f28617d031ef", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1782566056, + "narHash": "sha256-haEZcHzYrePnjFOYSWTbxm/Nrla0aPslJfmvdCvqtVc=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "c6e7b9f673f4360bc813d3dc75028f75ee88d3f8", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", + "hyprland-protocols": "hyprland-protocols", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwire": "hyprwire", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1784152565, + "narHash": "sha256-O1nPLiFNTCT3lAJz7Z44nNHgDwvZE0GUjALYzR5/gqw=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "0b0d7ede2192ae515638890037890bdecca6eba2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1782563850, + "narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1772460177, + "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1777320127, + "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1782554491, + "narHash": "sha256-+p3MlyN/nqRefcf2IckPlGRUn9+hielqpS9XClbLleM=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "bdba25ced39ea39ab004a8f31593ba0b0ff1ca35", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1783002634, + "narHash": "sha256-xGqHIUK0wIZoW7SiMalwvO6uGOO/VrlQwoRobpE7dDI=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "41fb809557abd29a57151b6e1aaeabd05f9437e1", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1777159683, + "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwire": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1778410714, + "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -315,11 +683,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1783895121, - "narHash": "sha256-w98u6zKAdIGmbKHrbCEo2dA26k/LjU95ev1eCxzV/5k=", + "lastModified": 1784155856, + "narHash": "sha256-NmDh+a2PGtAch8967S/SX+nKJ+6Pqa2xN0uOJa7O26s=", "owner": "mpiorowski", "repo": "late-sh", - "rev": "8355402e86f7dda93d79c5f0d9228e4a6378400a", + "rev": "939e13ee0c2d422ee4e3fa4ee3a1b0d4ba003b14", "type": "github" }, "original": { @@ -335,11 +703,11 @@ ] }, "locked": { - "lastModified": 1781526487, - "narHash": "sha256-pZ8xS3GGXUyzEN8JicUSpW7qRa22wPIPHOO15pS7jd4=", + "lastModified": 1784038797, + "narHash": "sha256-td6Ko5RV/TFw7ALmYP9YUVXMS1b7hW7vDqabrGXyzUo=", "owner": "0x5a4", "repo": "nix-easyroam", - "rev": "e519fa1db92ee5f3ffb1aabe504ca9863febc6dc", + "rev": "a6c72d25edc3b210bf6b2b46395c88be7efac147", "type": "github" }, "original": { @@ -350,7 +718,7 @@ }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" @@ -358,11 +726,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1783764089, - "narHash": "sha256-AzoohteEEymQ+m3fAXlQJ+mkFLQ9XjPRqSlgqJ7TLGY=", + "lastModified": 1784180987, + "narHash": "sha256-KdcGBJEFqF5qYhX3KPsMCItSy0nsDCoJydNT9GneeeA=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "f3c556542c423b5e790a94d0337a80cede816620", + "rev": "890525c6d82b37389fdea7e6b4cef267bd93055b", "type": "github" }, "original": { @@ -373,16 +741,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783816212, - "narHash": "sha256-2aZisVTVGSFEk3MYcOiWQp3zvwyzbqpktB69Rcfp150=", - "owner": "nixos", + "lastModified": 1783522502, + "narHash": "sha256-iffAls3iaNTyJC2faYcUXSI+Gp02cDjYl+MygxKl2GI=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "3b32825de172d0bc85664f495edb096b10862524", + "rev": "0bb7ec54c8483066ec9d7720e780a5caa71f8612", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -420,11 +788,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1783791668, - "narHash": "sha256-zbcZ1dmBTPfJ7Mlqh/yLEPGpgJnwuv4Xr1xucy2WqMA=", + "lastModified": 1784115452, + "narHash": "sha256-BoYPdqk6jlKXy+DyUzyGV/CtRGfAhk2MmIgBhsemTGI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "35d3407a3816f3b341d8cf1d60abaf2b7b8166ac", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1783915482, + "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "716c7a2664ca8325617b8a7fbb609273f2c4cae7", + "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee", "type": "github" }, "original": { @@ -437,15 +821,15 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2", - "systems": "systems_2" + "nixpkgs": "nixpkgs_3", + "systems": "systems_3" }, "locked": { - "lastModified": 1783869492, - "narHash": "sha256-47qs7UofgjxU6m7c90RycaHjvEXnVM5DeVEAtaPVPUA=", + "lastModified": 1784057377, + "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "4ef28e447b9003b67ff7fa9488a3be93c43312db", + "rev": "07180a087e4a00720dc0731cbcd8dec796974381", "type": "github" }, "original": { @@ -481,7 +865,7 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -502,14 +886,37 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1783008725, + "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", + "hyprland": "hyprland", "lanzaboote": "lanzaboote", "late-sh": "late-sh", "nix-easyroam": "nix-easyroam", "nixcord": "nixcord", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "stylix": "stylix" } @@ -569,18 +976,18 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_3", + "systems": "systems_4", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1783358511, - "narHash": "sha256-/F85cBWvU8b2hpawuCog464065ZTJtdMgVPWwJ9yHjE=", + "lastModified": 1784059683, + "narHash": "sha256-q5MZrmKlg9A4ORx3EQcr7qkuidMU1gVZ+xJ3nCK+xgc=", "owner": "nix-community", "repo": "stylix", - "rev": "14814ef555d8148ab82eba5054e654cd9eae3a1f", + "rev": "c8ccc31f3ea29dc3eb5b54945e5eb549529491d6", "type": "github" }, "original": { @@ -590,6 +997,21 @@ } }, "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -604,7 +1026,7 @@ "type": "github" } }, - "systems_2": { + "systems_3": { "locked": { "lastModified": 1774449309, "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", @@ -620,7 +1042,7 @@ "type": "github" } }, - "systems_3": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -698,6 +1120,47 @@ "repo": "base16-zed", "type": "github" } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1782644412, + "narHash": "sha256-/iSa/bL1QQFLv+uJ9gI0N87J8gOeZXvca7EjoPGKE6w=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "c01c99fc278ec68c82e9865923088f043c7c1621", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7fbdb40..49cb52c 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,7 @@ url = "github:mpiorowski/late-sh"; inputs.nixpkgs.follows = "nixpkgs"; }; + hyprland.url = "github:hyprwm/Hyprland"; lanzaboote = { url = "github:nix-community/lanzaboote/v1.1.0"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/hyprland.nix b/home/hyprland.nix new file mode 100644 index 0000000..6e779a1 --- /dev/null +++ b/home/hyprland.nix @@ -0,0 +1,8 @@ +{ inputs, pkgs, ... }: { + wayland.windowManager.hyprland = { + enable = true; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + portalPackage = + inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + }; +} From 9d078f67190c73076459a183ee1b42fbeb31b624 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 08:31:29 +0200 Subject: [PATCH 04/57] remove late --- flake.nix | 4 ---- home/home.nix | 1 - 2 files changed, 5 deletions(-) diff --git a/flake.nix b/flake.nix index 49cb52c..8669fef 100644 --- a/flake.nix +++ b/flake.nix @@ -22,10 +22,6 @@ url = "github:nix-community/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - late-sh = { - url = "github:mpiorowski/late-sh"; - inputs.nixpkgs.follows = "nixpkgs"; - }; hyprland.url = "github:hyprwm/Hyprland"; lanzaboote = { url = "github:nix-community/lanzaboote/v1.1.0"; diff --git a/home/home.nix b/home/home.nix index e0c52c8..afdeddb 100644 --- a/home/home.nix +++ b/home/home.nix @@ -16,7 +16,6 @@ rnote xournalpp git - inputs.late-sh.packages.${stdenv.hostPlatform.system}.late spotify fastfetch hyfetch From 7f37db417a68148a41fc4398c0528dc4248bfab3 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 08:33:16 +0200 Subject: [PATCH 05/57] update lockfile --- flake.lock | 83 ++------------------------------------------------- home/home.nix | 1 + 2 files changed, 4 insertions(+), 80 deletions(-) diff --git a/flake.lock b/flake.lock index 3777f8b..efa331c 100644 --- a/flake.lock +++ b/flake.lock @@ -238,24 +238,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "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" - } - }, "fromYaml": { "flake": false, "locked": { @@ -674,28 +656,6 @@ "type": "github" } }, - "late-sh": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay_2" - }, - "locked": { - "lastModified": 1784155856, - "narHash": "sha256-NmDh+a2PGtAch8967S/SX+nKJ+6Pqa2xN0uOJa7O26s=", - "owner": "mpiorowski", - "repo": "late-sh", - "rev": "939e13ee0c2d422ee4e3fa4ee3a1b0d4ba003b14", - "type": "github" - }, - "original": { - "owner": "mpiorowski", - "repo": "late-sh", - "type": "github" - } - }, "nix-easyroam": { "inputs": { "nixpkgs": [ @@ -822,7 +782,7 @@ "inputs": { "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs_3", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1784057377, @@ -913,7 +873,6 @@ "home-manager": "home-manager", "hyprland": "hyprland", "lanzaboote": "lanzaboote", - "late-sh": "late-sh", "nix-easyroam": "nix-easyroam", "nixcord": "nixcord", "nixpkgs": "nixpkgs_2", @@ -942,27 +901,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "late-sh", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1776222810, - "narHash": "sha256-5TD8MYqLMcJi9yV/9jq2dVUPtnu/lKZPD61esQCgvqs=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "4d6fee71fea68418a48992409b47f1183d0dd111", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -976,7 +914,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_4", + "systems": "systems_3", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -1012,21 +950,6 @@ } }, "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { "locked": { "lastModified": 1774449309, "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", @@ -1042,7 +965,7 @@ "type": "github" } }, - "systems_4": { + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/home/home.nix b/home/home.nix index afdeddb..0e0b0ae 100644 --- a/home/home.nix +++ b/home/home.nix @@ -8,6 +8,7 @@ imports = [ ./stylix.nix ./fastfetch.nix + ./hyprland.nix inputs.nixcord.homeModules.nixcord ]; # Home Manager needs a bit of information about you and the From 698031f03af06bc0d2a7b15ab988318f4553fd31 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 08:41:37 +0200 Subject: [PATCH 06/57] bundle hyprland.lua and enable stylix for hypr --- home/hyprland.lua | 322 ++++++++++++++++++++++++++++++++++++++++++++++ home/hyprland.nix | 4 + home/stylix.nix | 2 + 3 files changed, 328 insertions(+) create mode 100644 home/hyprland.lua diff --git a/home/hyprland.lua b/home/hyprland.lua new file mode 100644 index 0000000..cdc3aab --- /dev/null +++ b/home/hyprland.lua @@ -0,0 +1,322 @@ +-- This is an example Hyprland Lua config file. +-- Refer to the wiki for more information. +-- https://wiki.hypr.land/Configuring/Start/ + +-- Please note not all available settings / options are set here. +-- For a full list, see the wiki + +-- You can (and should!!) split this configuration into multiple files +-- Create your files separately and then require them like this: +-- require("myColors") + + +------------------ +---- MONITORS ---- +------------------ + +-- See https://wiki.hypr.land/Configuring/Basics/Monitors/ +hl.monitor({ + output = "", + mode = "preferred", + position = "auto", + scale = "1", +}) + +hl.monitor({ + output = "eDP-1", + mode = "preferred", + position = "auto", + scale = "1", + bitdepth = 10, + cm = "wide", +}) +hl.monitor({ + output = "DP-2", + mode = "2560x1440@165", + position = "auto", + scale = "1", + bitdepth = 10, + cm = "wide", +}) + +--------------------- +---- MY PROGRAMS ---- +--------------------- + +-- Set programs that you use +local terminal = "foot" +local fileManager = "thunar" +local menu = "fuzzel" + +------------------- +---- AUTOSTART ---- +------------------- + +-- See https://wiki.hypr.land/Configuring/Basics/Autostart/ + +-- Autostart necessary processes (like notifications daemons, status bars, etc.) +-- Or execute your favorite apps at launch like this: +-- +hl.on("hyprland.start", function() + hl.exec_cmd("qs") + hl.exec_cmd("gentoo-pipewire-launcher") + hl.exec_cmd("/usr/libexec/hyprpolkitagent") +end) + +------------------------------- +---- ENVIRONMENT VARIABLES ---- +------------------------------- + +-- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Environment-variables/ + +hl.env("XCURSOR_SIZE", "24") +hl.env("HYPRCURSOR_SIZE", "24") +hl.env("HYPRCURSOR_THEME", "Adwaita") +hl.env("XCURSOR_THEME", "Adwaita") +hl.env("GTK_THEME", "adw-gtk3") + +----------------------- +----- PERMISSIONS ----- +----------------------- + +-- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Permissions/ +-- Please note permission changes here require a Hyprland restart and are not applied on-the-fly +-- for security reasons + +-- hl.config({ +-- ecosystem = { +-- enforce_permissions = true, +-- }, +-- }) + +-- hl.permission("/usr/(bin|local/bin)/grim", "screencopy", "allow") +-- hl.permission("/usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland", "screencopy", "allow") +-- hl.permission("/usr/(bin|local/bin)/hyprpm", "plugin", "allow") + +----------------------- +---- LOOK AND FEEL ---- +----------------------- + +-- Refer to https://wiki.hypr.land/Configuring/Basics/Variables/ +require("colors") +hl.config({ + general = { + gaps_in = 2, + gaps_out = 8, + border_size = 4, + resize_on_border = false, + allow_tearing = false, + layout = "master", + }, + + decoration = { + rounding = 16, + rounding_power = 2, + + -- Change transparency of focused and unfocused windows + active_opacity = 1.0, + inactive_opacity = 1.0, + + shadow = { + enabled = false, + range = 4, + render_power = 3, + color = 0xee1a1a1a, + }, + + blur = { + enabled = false, + size = 3, + passes = 2, + vibrancy = 0.1696, + }, + }, + + animations = { + enabled = true, + }, +}) + +-- Default curves and animations, see https://wiki.hypr.land/Configuring/Advanced-and-Cool/Animations/ +hl.curve("easeOutQuint", { type = "bezier", points = { { 0.23, 1 }, { 0.32, 1 } } }) +hl.curve("easeInOutCubic", { type = "bezier", points = { { 0.65, 0.05 }, { 0.36, 1 } } }) +hl.curve("linear", { type = "bezier", points = { { 0, 0 }, { 1, 1 } } }) +hl.curve("almostLinear", { type = "bezier", points = { { 0.5, 0.5 }, { 0.75, 1 } } }) +hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } }) + +-- Default springs +hl.curve("easy", { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 }) + +hl.animation({ leaf = "global", enabled = true, speed = 10, bezier = "default" }) +hl.animation({ leaf = "border", enabled = true, speed = 5.39, bezier = "easeOutQuint" }) +hl.animation({ leaf = "windows", enabled = true, speed = 4.79, spring = "easy" }) +hl.animation({ leaf = "windowsIn", enabled = true, speed = 4.1, spring = "easy", style = "slide" }) +hl.animation({ leaf = "windowsOut", enabled = true, speed = 1.49, bezier = "linear", style = "popin 87%" }) +hl.animation({ leaf = "fadeIn", enabled = true, speed = 1.73, bezier = "almostLinear" }) +hl.animation({ leaf = "fadeOut", enabled = true, speed = 1.46, bezier = "almostLinear" }) +hl.animation({ leaf = "fade", enabled = true, speed = 3.03, bezier = "quick" }) +hl.animation({ leaf = "layers", enabled = true, speed = 3.81, bezier = "easeOutQuint" }) +hl.animation({ leaf = "layersIn", enabled = true, speed = 4, bezier = "easeOutQuint", style = "fade" }) +hl.animation({ leaf = "layersOut", enabled = true, speed = 1.5, bezier = "linear", style = "fade" }) +hl.animation({ leaf = "fadeLayersIn", enabled = true, speed = 1.79, bezier = "almostLinear" }) +hl.animation({ leaf = "fadeLayersOut", enabled = true, speed = 1.39, bezier = "almostLinear" }) +hl.animation({ leaf = "workspaces", enabled = true, speed = 1.94, bezier = "easeOutQuint", style = "slide" }) +hl.animation({ leaf = "zoomFactor", enabled = true, speed = 7, bezier = "quick" }) + +hl.config({ + master = { + new_status = "slave", + }, +}) + +--------------- +---- INPUT ---- +--------------- + +hl.config({ + input = { + kb_layout = "eu", + kb_variant = "", + kb_model = "", + kb_options = "", + kb_rules = "", + + follow_mouse = 1, + + sensitivity = -0.4, -- -1.0 - 1.0, 0 means no modification. + accel_profile = "flat", + + touchpad = { + natural_scroll = false, + }, + }, +}) + +hl.gesture({ + fingers = 3, + direction = "horizontal", + action = "workspace", +}) + +-- Example per-device config +-- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Devices/ for more + +--------------------- +---- KEYBINDINGS ---- +--------------------- + +local mainMod = "SUPER" -- Sets "Windows" key as main modifier +local aux_mod = "ALT" + +-- Example binds, see https://wiki.hypr.land/Configuring/Basics/Binds/ for more +hl.bind(mainMod .. " + Return", hl.dsp.exec_cmd(terminal)) +hl.bind(mainMod .. " + Q", hl.dsp.window.close()) +hl.bind( + mainMod .. " + M", + hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'") +) +hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(fileManager)) +hl.bind(mainMod .. " + V", hl.dsp.window.float({ action = "toggle" })) +hl.bind(mainMod .. " + Space", hl.dsp.exec_cmd(menu)) + +-- Move focus with mainMod + arrow keys +hl.bind(mainMod .. " + left", hl.dsp.focus({ direction = "left" })) +hl.bind(mainMod .. " + right", hl.dsp.focus({ direction = "right" })) +hl.bind(mainMod .. " + up", hl.dsp.focus({ direction = "up" })) +hl.bind(mainMod .. " + down", hl.dsp.focus({ direction = "down" })) +hl.bind(mainMod .. " + h", hl.dsp.focus({ direction = "left" })) +hl.bind(mainMod .. " + l", hl.dsp.focus({ direction = "right" })) +hl.bind(mainMod .. " + k", hl.dsp.focus({ direction = "up" })) +hl.bind(mainMod .. " + j", hl.dsp.focus({ direction = "down" })) + +for i = 1, 10 do + local key = i % 10 -- 10 maps to key 0 + hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = i })) + hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i })) +end + +-- Move/resize windows with mainMod + LMB/RMB and dragging +hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true }) +hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true }) +hl.bind(aux_mod .. " + mouse:272", hl.dsp.window.resize(), { mouse = true }) + +-- Laptop multimedia keys for volume and LCD brightness +hl.bind( + "XF86AudioRaiseVolume", + hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), + { locked = true, repeating = true } +) +hl.bind( + "XF86AudioLowerVolume", + hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), + { locked = true, repeating = true } +) +hl.bind( + "XF86AudioMute", + hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), + { locked = true, repeating = true } +) +hl.bind( + "XF86AudioMicMute", + hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), + { locked = true, repeating = true } +) +hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl set 5%+"), { locked = true, repeating = true }) +hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl set 5%-"), { locked = true, repeating = true }) + +-- Requires playerctl +hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true }) +hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true }) +hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true }) +hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true }) + +-- Screenshot binds +hl.bind(aux_mod .. " + S", hl.dsp.exec_cmd("grimblast copy output -n -c")) +hl.bind(mainMod .. " + S", hl.dsp.exec_cmd("grimblast copy area -n -f")) +-- misc binds +hl.bind(mainMod .. " + w", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-wall fuzzel")) +hl.bind(mainMod .. " + t", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-theme fuzzel")) + +-------------------------------- +---- WINDOWS AND WORKSPACES ---- +-------------------------------- + +-- See https://wiki.hypr.land/Configuring/Basics/Window-Rules/ +-- and https://wiki.hypr.land/Configuring/Basics/Workspace-Rules/ + +-- Example window rules that are useful + +hl.window_rule({ + -- Ignore maximize requests from all apps. You'll probably like this. + name = "suppress-maximize-events", + match = { class = ".*" }, + + suppress_event = "maximize", +}) + +hl.window_rule({ + -- Fix some dragging issues with XWayland + name = "fix-xwayland-drags", + match = { + class = "^$", + title = "^$", + xwayland = true, + float = true, + fullscreen = false, + pin = false, + }, + + no_focus = true, +}) + +hl.window_rule({ + name = "discord-to-ws6", + match = { class = "^(discord)$" }, + workspace = "6 silent", +}) + +hl.window_rule({ + name = "spotify-to-ws7", + match = { class = "^(Spotify)$" }, + workspace = "7 silent", +}) diff --git a/home/hyprland.nix b/home/hyprland.nix index 6e779a1..a373d63 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -2,7 +2,11 @@ wayland.windowManager.hyprland = { enable = true; package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + systemd.enable = false; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + extraLuaFiles = { + "main.lua" = ./hyprland.lua; + }; }; } diff --git a/home/stylix.nix b/home/stylix.nix index ec5c812..4be23ec 100644 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -13,6 +13,8 @@ kde.enable = true; kde.useWallpaper = false; qt.enable = true; + hyprland.enable = true; + hyprland.hyprpaper.enable = false; }; }; } From 04b83bdce0675276ae80c8cc589a708aef88646e Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 08:44:36 +0200 Subject: [PATCH 07/57] fix hyprland.lua --- home/hyprland.lua | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/home/hyprland.lua b/home/hyprland.lua index cdc3aab..1bf0fb5 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -44,7 +44,7 @@ hl.monitor({ --------------------- -- Set programs that you use -local terminal = "foot" +local terminal = "ghostty" local fileManager = "thunar" local menu = "fuzzel" @@ -59,7 +59,6 @@ local menu = "fuzzel" -- hl.on("hyprland.start", function() hl.exec_cmd("qs") - hl.exec_cmd("gentoo-pipewire-launcher") hl.exec_cmd("/usr/libexec/hyprpolkitagent") end) @@ -69,11 +68,11 @@ end) -- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Environment-variables/ -hl.env("XCURSOR_SIZE", "24") -hl.env("HYPRCURSOR_SIZE", "24") -hl.env("HYPRCURSOR_THEME", "Adwaita") -hl.env("XCURSOR_THEME", "Adwaita") -hl.env("GTK_THEME", "adw-gtk3") +-- hl.env("XCURSOR_SIZE", "24") +-- hl.env("HYPRCURSOR_SIZE", "24") +-- hl.env("HYPRCURSOR_THEME", "Adwaita") +-- hl.env("XCURSOR_THEME", "Adwaita") +-- hl.env("GTK_THEME", "adw-gtk3") ----------------------- ----- PERMISSIONS ----- @@ -98,7 +97,6 @@ hl.env("GTK_THEME", "adw-gtk3") ----------------------- -- Refer to https://wiki.hypr.land/Configuring/Basics/Variables/ -require("colors") hl.config({ general = { gaps_in = 2, From 039dce42b782bf033f250c24c3efa305ad8d9175 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 08:47:50 +0200 Subject: [PATCH 08/57] add packages and switch to ly --- configuration.nix | 3 +-- home/home.nix | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configuration.nix b/configuration.nix index fbca7ec..f4d04a1 100644 --- a/configuration.nix +++ b/configuration.nix @@ -46,8 +46,7 @@ }; services = { desktopManager.plasma6.enable = true; - displayManager.sddm.enable = true; - displayManager.sddm.wayland.enable = true; + displayManager.ly.enable = true; }; security.doas.enable = true; diff --git a/home/home.nix b/home/home.nix index 0e0b0ae..74b3ab2 100644 --- a/home/home.nix +++ b/home/home.nix @@ -20,6 +20,9 @@ spotify fastfetch hyfetch + fuzzel + quickshell + nemo ]; home.pointerCursor.enable = true; home.username = "lucy"; From 91b3af91e0d345e3d450a72d831a9dc7cde93011 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 08:56:52 +0200 Subject: [PATCH 09/57] hl config changes --- home/hyprland.lua | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/home/hyprland.lua b/home/hyprland.lua index 1bf0fb5..ef4304e 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -123,8 +123,8 @@ hl.config({ }, blur = { - enabled = false, - size = 3, + enabled = true, + size = 4, passes = 2, vibrancy = 0.1696, }, @@ -145,20 +145,11 @@ hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } }) -- Default springs hl.curve("easy", { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 }) -hl.animation({ leaf = "global", enabled = true, speed = 10, bezier = "default" }) -hl.animation({ leaf = "border", enabled = true, speed = 5.39, bezier = "easeOutQuint" }) -hl.animation({ leaf = "windows", enabled = true, speed = 4.79, spring = "easy" }) -hl.animation({ leaf = "windowsIn", enabled = true, speed = 4.1, spring = "easy", style = "slide" }) -hl.animation({ leaf = "windowsOut", enabled = true, speed = 1.49, bezier = "linear", style = "popin 87%" }) -hl.animation({ leaf = "fadeIn", enabled = true, speed = 1.73, bezier = "almostLinear" }) -hl.animation({ leaf = "fadeOut", enabled = true, speed = 1.46, bezier = "almostLinear" }) -hl.animation({ leaf = "fade", enabled = true, speed = 3.03, bezier = "quick" }) -hl.animation({ leaf = "layers", enabled = true, speed = 3.81, bezier = "easeOutQuint" }) -hl.animation({ leaf = "layersIn", enabled = true, speed = 4, bezier = "easeOutQuint", style = "fade" }) -hl.animation({ leaf = "layersOut", enabled = true, speed = 1.5, bezier = "linear", style = "fade" }) -hl.animation({ leaf = "fadeLayersIn", enabled = true, speed = 1.79, bezier = "almostLinear" }) -hl.animation({ leaf = "fadeLayersOut", enabled = true, speed = 1.39, bezier = "almostLinear" }) -hl.animation({ leaf = "workspaces", enabled = true, speed = 1.94, bezier = "easeOutQuint", style = "slide" }) +hl.animation({ leaf = "global", enabled = true, speed = 5, bezier = "easy" }) +hl.animation({ leaf = "windows", enabled = true, speed = 2, spring = "easy" }) +hl.animation({ leaf = "fade", enabled = true, speed = 3, bezier = "quick" }) +hl.animation({ leaf = "layers", enabled = true, speed = 4, bezier = "easeOutQuint" }) +hl.animation({ leaf = "workspaces", enabled = true, speed = 2, bezier = "easeOutQuint", style = "slide" }) hl.animation({ leaf = "zoomFactor", enabled = true, speed = 7, bezier = "quick" }) hl.config({ From 5c966f1a5bfb14f01e59aa6433916a2ae4fcb8c6 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 09:45:31 +0200 Subject: [PATCH 10/57] change services and enable fuzzel in stylix --- home/home.nix | 7 ++++--- home/hyprland.lua | 6 +++--- home/stylix.nix | 7 +------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/home/home.nix b/home/home.nix index 74b3ab2..b316e80 100644 --- a/home/home.nix +++ b/home/home.nix @@ -14,15 +14,14 @@ # Home Manager needs a bit of information about you and the # paths it should manage. home.packages = with pkgs; [ - rnote xournalpp git spotify fastfetch hyfetch - fuzzel - quickshell nemo + pavucontrol + material-symbols ]; home.pointerCursor.enable = true; home.username = "lucy"; @@ -39,6 +38,8 @@ }; }; }; + programs.quickshell.enable = true; + programs.fuzzel.enable = true; programs.nixcord = { enable = true; discord.vencord.enable = true; diff --git a/home/hyprland.lua b/home/hyprland.lua index ef4304e..c6d75fe 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -145,8 +145,8 @@ hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } }) -- Default springs hl.curve("easy", { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 }) -hl.animation({ leaf = "global", enabled = true, speed = 5, bezier = "easy" }) -hl.animation({ leaf = "windows", enabled = true, speed = 2, spring = "easy" }) +hl.animation({ leaf = "global", enabled = true, speed = 5, bezier = "default" }) +hl.animation({ leaf = "windows", enabled = true, speed = 2, spring = "default" }) hl.animation({ leaf = "fade", enabled = true, speed = 3, bezier = "quick" }) hl.animation({ leaf = "layers", enabled = true, speed = 4, bezier = "easeOutQuint" }) hl.animation({ leaf = "workspaces", enabled = true, speed = 2, bezier = "easeOutQuint", style = "slide" }) @@ -172,7 +172,7 @@ hl.config({ follow_mouse = 1, - sensitivity = -0.4, -- -1.0 - 1.0, 0 means no modification. + sensitivity = 0, -- -1.0 - 1.0, 0 means no modification. accel_profile = "flat", touchpad = { diff --git a/home/stylix.nix b/home/stylix.nix index 4be23ec..25c2059 100644 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -5,16 +5,11 @@ targets = { gtk.enable = true; ghostty.enable = true; - firefox.enable = true; - firefox.profileNames = [ "lucy" ]; - firefox.colorTheme.enable = true; nixcord.enable = true; - xresources.enable = true; - kde.enable = true; - kde.useWallpaper = false; qt.enable = true; hyprland.enable = true; hyprland.hyprpaper.enable = false; + fuzzel.enable = true; }; }; } From 1ca4fe4692d58ca41060d04a9546bcea014a20fd Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 09:50:34 +0200 Subject: [PATCH 11/57] add padding to ghostty --- home/home.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/home.nix b/home/home.nix index b316e80..f5ea1be 100644 --- a/home/home.nix +++ b/home/home.nix @@ -76,6 +76,10 @@ }; programs.ghostty = { enable = true; + settings = { + window-padding-x = 10; + window-padding-y = 10; + }; }; # DANGER ZONE programs.home-manager.enable = true; From c8a7d357b7f2016f6151568a3e14c486b27f15c0 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 09:54:39 +0200 Subject: [PATCH 12/57] change hl keybinds --- home/home.nix | 4 ++-- home/hyprland.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/home/home.nix b/home/home.nix index f5ea1be..db4f093 100644 --- a/home/home.nix +++ b/home/home.nix @@ -77,8 +77,8 @@ programs.ghostty = { enable = true; settings = { - window-padding-x = 10; - window-padding-y = 10; + window-padding-x = 20; + window-padding-y = 20; }; }; # DANGER ZONE diff --git a/home/hyprland.lua b/home/hyprland.lua index c6d75fe..cd8c93b 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -260,8 +260,8 @@ hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = tru hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true }) -- Screenshot binds -hl.bind(aux_mod .. " + S", hl.dsp.exec_cmd("grimblast copy output -n -c")) -hl.bind(mainMod .. " + S", hl.dsp.exec_cmd("grimblast copy area -n -f")) +hl.bind(aux_mod .. "SHIFT + S", hl.dsp.exec_cmd("grimblast copy output -n -c")) +hl.bind(mainMod .. "SHIFT + S", hl.dsp.exec_cmd("grimblast copy area -n -f")) -- misc binds hl.bind(mainMod .. " + w", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-wall fuzzel")) hl.bind(mainMod .. " + t", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-theme fuzzel")) From e537db4d9fba7407ecb23b61d0584dd01ce88831 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 09:56:19 +0200 Subject: [PATCH 13/57] change hl keybinds AGAIN --- home/hyprland.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/hyprland.lua b/home/hyprland.lua index cd8c93b..a3625ed 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -260,8 +260,8 @@ hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = tru hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true }) -- Screenshot binds -hl.bind(aux_mod .. "SHIFT + S", hl.dsp.exec_cmd("grimblast copy output -n -c")) -hl.bind(mainMod .. "SHIFT + S", hl.dsp.exec_cmd("grimblast copy area -n -f")) +hl.bind(aux_mod .. " SHIFT + S", hl.dsp.exec_cmd("grimblast copy output -n -c")) +hl.bind(mainMod .. " SHIFT + S", hl.dsp.exec_cmd("grimblast copy area -n -f")) -- misc binds hl.bind(mainMod .. " + w", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-wall fuzzel")) hl.bind(mainMod .. " + t", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-theme fuzzel")) From bc68b735a7baab0eb91b0a64113507aa4e671c2b Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 09:58:04 +0200 Subject: [PATCH 14/57] change hl keybinds AGAIN --- home/hyprland.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/hyprland.lua b/home/hyprland.lua index a3625ed..93ded99 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -260,8 +260,8 @@ hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = tru hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true }) -- Screenshot binds -hl.bind(aux_mod .. " SHIFT + S", hl.dsp.exec_cmd("grimblast copy output -n -c")) -hl.bind(mainMod .. " SHIFT + S", hl.dsp.exec_cmd("grimblast copy area -n -f")) +hl.bind(aux_mod .. "+ SHIFT + S", hl.dsp.exec_cmd("grimblast copy output -n -c")) +hl.bind(mainMod .. "+ SHIFT + S", hl.dsp.exec_cmd("grimblast copy area -n -f")) -- misc binds hl.bind(mainMod .. " + w", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-wall fuzzel")) hl.bind(mainMod .. " + t", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-theme fuzzel")) From e2f042f7d3edf8665cda588b7d50c644e3146d6f Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 12:32:14 +0200 Subject: [PATCH 15/57] fix up nixvim config --- nixvim/plugins.nix | 20 ++++++++++++++++++++ stylix.nix | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/nixvim/plugins.nix b/nixvim/plugins.nix index aad00ca..1c9ecc0 100644 --- a/nixvim/plugins.nix +++ b/nixvim/plugins.nix @@ -38,6 +38,7 @@ lualine = { enable = true; settings = { + extensions = [ "toggleterm" ]; options = { section_separators = { left = "▎"; @@ -48,6 +49,25 @@ right = ""; }; }; + inactive_sections = { + lualine_a = [ + "mode" + ]; + lualine_b = [ + "filename" + "filetype" + ]; + lualine_c = [ + "diagnostics" + ]; + lualine_x = [ + "lsp_status" + ]; + lualine_y = [ ]; + lualine_z = [ + "location" + ]; + }; sections = { lualine_a = [ "mode" diff --git a/stylix.nix b/stylix.nix index afdcfe3..961b7c1 100644 --- a/stylix.nix +++ b/stylix.nix @@ -24,7 +24,7 @@ stylix = { enable = true; autoEnable = false; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; polarity = "dark"; image = ./wallpaper.png; targets = { From ad18a1b3534702f6b4f7dcc4214d9758a21a62e2 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 22:04:54 +0200 Subject: [PATCH 16/57] switch to foot --- home/home.nix | 22 ++++------------------ home/hyprland.lua | 8 ++++---- home/stylix.nix | 2 +- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/home/home.nix b/home/home.nix index db4f093..d45375a 100644 --- a/home/home.nix +++ b/home/home.nix @@ -59,26 +59,12 @@ }; programs.google-chrome.enable = true; - programs.firefox = { - enable = false; - profiles = { - lucy = { - isDefault = true; - extensions.force = true; - path = "lucy"; - id = 0; - settings = { - default = true; - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - }; - }; - }; - }; - programs.ghostty = { + programs.foot = { enable = true; settings = { - window-padding-x = 20; - window-padding-y = 20; + main = { + pad = "10x10"; + }; }; }; # DANGER ZONE diff --git a/home/hyprland.lua b/home/hyprland.lua index 93ded99..2124906 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -44,8 +44,8 @@ hl.monitor({ --------------------- -- Set programs that you use -local terminal = "ghostty" -local fileManager = "thunar" +local terminal = "foot" +local fileManager = "nemo" local menu = "fuzzel" ------------------- @@ -145,8 +145,8 @@ hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } }) -- Default springs hl.curve("easy", { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 }) -hl.animation({ leaf = "global", enabled = true, speed = 5, bezier = "default" }) -hl.animation({ leaf = "windows", enabled = true, speed = 2, spring = "default" }) +hl.animation({ leaf = "global", enabled = true, speed = 5, bezier = "easeInOutCubic" }) +hl.animation({ leaf = "windows", enabled = true, speed = 2, bezier = "easeInOutCubic" }) hl.animation({ leaf = "fade", enabled = true, speed = 3, bezier = "quick" }) hl.animation({ leaf = "layers", enabled = true, speed = 4, bezier = "easeOutQuint" }) hl.animation({ leaf = "workspaces", enabled = true, speed = 2, bezier = "easeOutQuint", style = "slide" }) diff --git a/home/stylix.nix b/home/stylix.nix index 25c2059..68bfa4d 100644 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -4,12 +4,12 @@ autoEnable = false; targets = { gtk.enable = true; - ghostty.enable = true; nixcord.enable = true; qt.enable = true; hyprland.enable = true; hyprland.hyprpaper.enable = false; fuzzel.enable = true; + foot.enable = true; }; }; } From 7b2450ebb3e407f06f589fd4e79dd7f434a58386 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 22:10:38 +0200 Subject: [PATCH 17/57] change anim style --- home/hyprland.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/hyprland.lua b/home/hyprland.lua index 2124906..14382e5 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -146,10 +146,10 @@ hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } }) hl.curve("easy", { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 }) hl.animation({ leaf = "global", enabled = true, speed = 5, bezier = "easeInOutCubic" }) -hl.animation({ leaf = "windows", enabled = true, speed = 2, bezier = "easeInOutCubic" }) +hl.animation({ leaf = "windows", enabled = true, speed = 4, bezier = "easeOutQuint", style = "slide" }) hl.animation({ leaf = "fade", enabled = true, speed = 3, bezier = "quick" }) hl.animation({ leaf = "layers", enabled = true, speed = 4, bezier = "easeOutQuint" }) -hl.animation({ leaf = "workspaces", enabled = true, speed = 2, bezier = "easeOutQuint", style = "slide" }) +hl.animation({ leaf = "workspaces", enabled = true, speed = 2, bezier = "easeOutQuint", style = "slidevert" }) hl.animation({ leaf = "zoomFactor", enabled = true, speed = 7, bezier = "quick" }) hl.config({ From b541f1891beaf25a3f8d573f52b3b68ccb51ff43 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 22:24:58 +0200 Subject: [PATCH 18/57] change hyprland config --- home/hyprland.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home/hyprland.lua b/home/hyprland.lua index 14382e5..3b3d3cd 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -99,8 +99,8 @@ end) -- Refer to https://wiki.hypr.land/Configuring/Basics/Variables/ hl.config({ general = { - gaps_in = 2, - gaps_out = 8, + gaps_in = 5, + gaps_out = 10, border_size = 4, resize_on_border = false, allow_tearing = false, @@ -124,7 +124,7 @@ hl.config({ blur = { enabled = true, - size = 4, + size = 2, passes = 2, vibrancy = 0.1696, }, From 2c2b8c85702144dd8b7b10e03af08134f26884de Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 22:31:22 +0200 Subject: [PATCH 19/57] clean up hyprland.lua --- home/hyprland.lua | 95 +++-------------------------------------------- 1 file changed, 5 insertions(+), 90 deletions(-) diff --git a/home/hyprland.lua b/home/hyprland.lua index 3b3d3cd..2dba95c 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -1,20 +1,3 @@ --- This is an example Hyprland Lua config file. --- Refer to the wiki for more information. --- https://wiki.hypr.land/Configuring/Start/ - --- Please note not all available settings / options are set here. --- For a full list, see the wiki - --- You can (and should!!) split this configuration into multiple files --- Create your files separately and then require them like this: --- require("myColors") - - ------------------- ----- MONITORS ---- ------------------- - --- See https://wiki.hypr.land/Configuring/Basics/Monitors/ hl.monitor({ output = "", mode = "preferred", @@ -39,69 +22,20 @@ hl.monitor({ cm = "wide", }) ---------------------- ----- MY PROGRAMS ---- ---------------------- - --- Set programs that you use +- Set programs that you use local terminal = "foot" local fileManager = "nemo" local menu = "fuzzel" -------------------- ----- AUTOSTART ---- -------------------- - --- See https://wiki.hypr.land/Configuring/Basics/Autostart/ - --- Autostart necessary processes (like notifications daemons, status bars, etc.) --- Or execute your favorite apps at launch like this: --- hl.on("hyprland.start", function() hl.exec_cmd("qs") hl.exec_cmd("/usr/libexec/hyprpolkitagent") end) - -------------------------------- ----- ENVIRONMENT VARIABLES ---- -------------------------------- - --- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Environment-variables/ - --- hl.env("XCURSOR_SIZE", "24") --- hl.env("HYPRCURSOR_SIZE", "24") --- hl.env("HYPRCURSOR_THEME", "Adwaita") --- hl.env("XCURSOR_THEME", "Adwaita") --- hl.env("GTK_THEME", "adw-gtk3") - ------------------------ ------ PERMISSIONS ----- ------------------------ - --- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Permissions/ --- Please note permission changes here require a Hyprland restart and are not applied on-the-fly --- for security reasons - --- hl.config({ --- ecosystem = { --- enforce_permissions = true, --- }, --- }) - --- hl.permission("/usr/(bin|local/bin)/grim", "screencopy", "allow") --- hl.permission("/usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland", "screencopy", "allow") --- hl.permission("/usr/(bin|local/bin)/hyprpm", "plugin", "allow") - ------------------------ ----- LOOK AND FEEL ---- ------------------------ - --- Refer to https://wiki.hypr.land/Configuring/Basics/Variables/ hl.config({ general = { gaps_in = 5, gaps_out = 10, - border_size = 4, + border_size = 2, resize_on_border = false, allow_tearing = false, layout = "master", @@ -110,13 +44,10 @@ hl.config({ decoration = { rounding = 16, rounding_power = 2, - - -- Change transparency of focused and unfocused windows active_opacity = 1.0, inactive_opacity = 1.0, - shadow = { - enabled = false, + enabled = true, range = 4, render_power = 3, color = 0xee1a1a1a, @@ -124,7 +55,7 @@ hl.config({ blur = { enabled = true, - size = 2, + size = 3, passes = 2, vibrancy = 0.1696, }, @@ -183,17 +114,10 @@ hl.config({ hl.gesture({ fingers = 3, - direction = "horizontal", + direction = "vertical", action = "workspace", }) --- Example per-device config --- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Devices/ for more - ---------------------- ----- KEYBINDINGS ---- ---------------------- - local mainMod = "SUPER" -- Sets "Windows" key as main modifier local aux_mod = "ALT" @@ -266,15 +190,6 @@ hl.bind(mainMod .. "+ SHIFT + S", hl.dsp.exec_cmd("grimblast copy area -n -f")) hl.bind(mainMod .. " + w", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-wall fuzzel")) hl.bind(mainMod .. " + t", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-theme fuzzel")) --------------------------------- ----- WINDOWS AND WORKSPACES ---- --------------------------------- - --- See https://wiki.hypr.land/Configuring/Basics/Window-Rules/ --- and https://wiki.hypr.land/Configuring/Basics/Workspace-Rules/ - --- Example window rules that are useful - hl.window_rule({ -- Ignore maximize requests from all apps. You'll probably like this. name = "suppress-maximize-events", From a9aef735eb52385727cb742427e3789b70902c61 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 22:35:24 +0200 Subject: [PATCH 20/57] fix typo in hyprland.lua --- home/hyprland.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/hyprland.lua b/home/hyprland.lua index 2dba95c..1359c4e 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -22,7 +22,7 @@ hl.monitor({ cm = "wide", }) -- Set programs that you use +-- Set programs that you use local terminal = "foot" local fileManager = "nemo" local menu = "fuzzel" From 82f6cb80389a9b1097b86b13178989cf4a9a312b Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 22:51:34 +0200 Subject: [PATCH 21/57] add upower to make qs happy --- configuration.nix | 13 ++++++++++--- flake.nix | 1 + home/hyprland.nix | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index f4d04a1..fb9fb6a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,12 +2,14 @@ config, lib, pkgs, + inputs, ... }: { imports = [ ./stylix.nix ./nixvim/nixvim.nix + ]; boot.loader.systemd-boot.enable = true; @@ -39,16 +41,21 @@ LC_TELEPHONE = "de_DE.UTF-8"; LC_TIME = "de_DE.UTF-8"; }; - services.xserver.enable = true; + services.upower.enable = true; + services.xserver.enable = false; services.xserver.xkb = { layout = "eu"; variant = ""; }; services = { - desktopManager.plasma6.enable = true; displayManager.ly.enable = true; }; - + programs.hyprland = { + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + enable = true; + withUWSM = true; # recommended for most users + xwayland.enable = true; # Xwayland can be disabled. + }; security.doas.enable = true; security.sudo.enable = false; security.doas.extraRules = [ diff --git a/flake.nix b/flake.nix index 8669fef..dc97b5f 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,7 @@ }: { nixosConfigurations.seele = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; modules = [ ./easyroam.nix ./configuration.nix diff --git a/home/hyprland.nix b/home/hyprland.nix index a373d63..4f42e3e 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -1,7 +1,7 @@ { inputs, pkgs, ... }: { wayland.windowManager.hyprland = { enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + package = null; systemd.enable = false; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; From 122918fe71c540f2584ed7745d67653b3d32b055 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 16 Jul 2026 22:56:42 +0200 Subject: [PATCH 22/57] add powermanagement --- configuration.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/configuration.nix b/configuration.nix index fb9fb6a..8e1736a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -42,14 +42,25 @@ LC_TIME = "de_DE.UTF-8"; }; services.upower.enable = true; - services.xserver.enable = false; + services.tlp = { + enable = true; + settings = { + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + CPU_MIN_PERF_ON_AC = 0; + CPU_MAX_PERF_ON_AC = 100; + CPU_MIN_PERF_ON_BAT = 0; + CPU_MAX_PERF_ON_BAT = 20; + }; + }; services.xserver.xkb = { layout = "eu"; variant = ""; }; - services = { - displayManager.ly.enable = true; - }; + services.displayManager.ly.enable = true; + powerManagement.powertop.enable = true; programs.hyprland = { package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; enable = true; From ca752d89f4dbd399b1d9f900f52d5d13da666bc5 Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 17 Jul 2026 15:29:50 +0200 Subject: [PATCH 23/57] add special ws to hyprland config --- configuration.nix | 2 +- home/hyprland.lua | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 8e1736a..b8ca5f4 100644 --- a/configuration.nix +++ b/configuration.nix @@ -100,7 +100,7 @@ # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; programs.xppen = { - enable = false; + enable = true; package = pkgs.xppen_4.overrideAttrs (old: { src = pkgs.fetchurl { url = "https://download01.xp-pen.com/file/2026/04/XPPenLinux4.0.15-260422.tar.gz"; diff --git a/home/hyprland.lua b/home/hyprland.lua index 1359c4e..377644e 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -189,6 +189,8 @@ hl.bind(mainMod .. "+ SHIFT + S", hl.dsp.exec_cmd("grimblast copy area -n -f")) -- misc binds hl.bind(mainMod .. " + w", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-wall fuzzel")) hl.bind(mainMod .. " + t", hl.dsp.exec_cmd("/etc/bash/bashrc.d/90-qs.bash switch-theme fuzzel")) +hl.bind(mainMod .. "+ SHIFT + minus", hl.dsp.window.move({ workspace = "special:scratchpad" })) +hl.bind(mainMod .. " + minus", hl.dsp.workspace.toggle_special("scratchpad")) hl.window_rule({ -- Ignore maximize requests from all apps. You'll probably like this. From ab1453a501a3d03d4b7a9cbcfb1d15a0e334523a Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 17 Jul 2026 23:14:05 +0200 Subject: [PATCH 24/57] update lockfile and use hyprland.lua symlink --- flake.lock | 18 +++++++++--------- home/hyprland.nix | 16 ++++++++++++---- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index efa331c..2b67b27 100644 --- a/flake.lock +++ b/flake.lock @@ -388,11 +388,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1784152565, - "narHash": "sha256-O1nPLiFNTCT3lAJz7Z44nNHgDwvZE0GUjALYzR5/gqw=", + "lastModified": 1784303676, + "narHash": "sha256-yjLMggvtVM67XDngpjIGZnmM8uGEjYXHHN+z+UP6F4I=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0b0d7ede2192ae515638890037890bdecca6eba2", + "rev": "4afc273db287ad4069cc8ab3edff4a09c31d3410", "type": "github" }, "original": { @@ -686,11 +686,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1784180987, - "narHash": "sha256-KdcGBJEFqF5qYhX3KPsMCItSy0nsDCoJydNT9GneeeA=", + "lastModified": 1784310259, + "narHash": "sha256-i6GIP3d+M5z2h72GsO6TBehImXau/VBBdZwCRiadAu0=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "890525c6d82b37389fdea7e6b4cef267bd93055b", + "rev": "bf7b06ce5ca24e43829e53183899912af2722c6c", "type": "github" }, "original": { @@ -748,11 +748,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1784115452, - "narHash": "sha256-BoYPdqk6jlKXy+DyUzyGV/CtRGfAhk2MmIgBhsemTGI=", + "lastModified": 1784210874, + "narHash": "sha256-x8i+HYAulduMlM63oxWJj5tAm+Sc/W756wUzcV5p24w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "35d3407a3816f3b341d8cf1d60abaf2b7b8166ac", + "rev": "59682e0069f0ed0a452e2179a7f4c1f247027b9e", "type": "github" }, "original": { diff --git a/home/hyprland.nix b/home/hyprland.nix index 4f42e3e..316c343 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -1,12 +1,20 @@ -{ inputs, pkgs, ... }: { +{ + config, + inputs, + pkgs, + ... +}: +{ wayland.windowManager.hyprland = { enable = true; package = null; systemd.enable = false; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; - extraLuaFiles = { - "main.lua" = ./hyprland.lua; - }; }; + extraConfig = '' + require("main") + ''; + xdg.configFile."hypr/main.lua".source = + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos/home/hyprland.lua"; } From f9a9e0336083a61451d97d8c903583d8612dd074 Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 17 Jul 2026 23:23:48 +0200 Subject: [PATCH 25/57] silence xdg portal warnings --- configuration.nix | 3 +-- home/hyprland.nix | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/configuration.nix b/configuration.nix index b8ca5f4..347fdc9 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,6 +1,4 @@ { - config, - lib, pkgs, inputs, ... @@ -15,6 +13,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages; + system.switch.enableNg = true; nix.settings.experimental-features = [ "nix-command" "flakes" diff --git a/home/hyprland.nix b/home/hyprland.nix index 316c343..a137095 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -9,12 +9,23 @@ enable = true; package = null; systemd.enable = false; + extraConfig = '' + require("main") + ''; portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; }; - extraConfig = '' - require("main") - ''; xdg.configFile."hypr/main.lua".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos/home/hyprland.lua"; + xdg.portal.config = { + common = { + default = [ "gtk" ]; + }; + hyprland = { + default = [ "hyprland" ]; + "org.freedesktop.impl.portal.Secret" = [ + "gnome-keyring" + ]; + }; + }; } From 5c1b244bc1a183ee33fa6446c839a36d9c0e144b Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 17 Jul 2026 23:31:58 +0200 Subject: [PATCH 26/57] fix up things --- configuration.nix | 2 +- home/hyprland.lua | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index 347fdc9..744fddb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,5 @@ { + config, pkgs, inputs, ... @@ -13,7 +14,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages; - system.switch.enableNg = true; nix.settings.experimental-features = [ "nix-command" "flakes" diff --git a/home/hyprland.lua b/home/hyprland.lua index 377644e..45b217f 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -42,8 +42,8 @@ hl.config({ }, decoration = { - rounding = 16, - rounding_power = 2, + rounding = 20, + rounding_power = 3, active_opacity = 1.0, inactive_opacity = 1.0, shadow = { @@ -81,6 +81,7 @@ hl.animation({ leaf = "windows", enabled = true, speed = 4, bezier = "easeOutQui hl.animation({ leaf = "fade", enabled = true, speed = 3, bezier = "quick" }) hl.animation({ leaf = "layers", enabled = true, speed = 4, bezier = "easeOutQuint" }) hl.animation({ leaf = "workspaces", enabled = true, speed = 2, bezier = "easeOutQuint", style = "slidevert" }) +hl.animation({ leaf = "border", enabled = false, speed = 2, bezier = "easeOutQuint", style = "slidevert" }) hl.animation({ leaf = "zoomFactor", enabled = true, speed = 7, bezier = "quick" }) hl.config({ From d744cfe4eedd5054d6a157c5959c52c2f87cff91 Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 18 Jul 2026 18:08:40 +0200 Subject: [PATCH 27/57] add blueman and remove useless packages --- configuration.nix | 11 +- flake.lock | 489 ++-------------------------------------------- flake.nix | 1 - home/hyprland.lua | 4 +- home/hyprland.nix | 2 +- stylix.nix | 2 +- 6 files changed, 19 insertions(+), 490 deletions(-) diff --git a/configuration.nix b/configuration.nix index 744fddb..3478218 100644 --- a/configuration.nix +++ b/configuration.nix @@ -20,10 +20,6 @@ ]; nix.package = pkgs.lixPackageSets.stable.lix; nix.settings.trusted-users = [ "lucy" ]; - nix.settings = { - substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; - }; networking.hostName = "nixos"; # Define your hostname. networking.networkmanager.enable = true; networking.networkmanager.wifi.powersave = false; @@ -61,7 +57,7 @@ services.displayManager.ly.enable = true; powerManagement.powertop.enable = true; programs.hyprland = { - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + package = pkgs.hyprland; enable = true; withUWSM = true; # recommended for most users xwayland.enable = true; # Xwayland can be disabled. @@ -168,10 +164,6 @@ nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ - kdePackages.kcalc # Calculator - kdePackages.kclock # Clock app - kdePackages.sddm-kcm # SDDM configuration module - kdePackages.isoimagewriter # Write hybrid ISOs to USB wl-clipboard btop ripgrep @@ -179,6 +171,7 @@ bat grimblast git + blueman ]; hardware.bluetooth = { enable = true; diff --git a/flake.lock b/flake.lock index 2b67b27..d3bfde8 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,5 @@ { "nodes": { - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1782073106, - "narHash": "sha256-dnS5SaZlPqR1E0dPXaPc+lFkBwLUbAgbwsVMk7uA6dY=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "6d6e2384f381def4ea4ea81543cba4bbdac72457", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -149,22 +116,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -313,325 +264,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1776511930, - "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "39435900785d0c560c6ae8777d29f28617d031ef", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprgraphics": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1782566056, - "narHash": "sha256-haEZcHzYrePnjFOYSWTbxm/Nrla0aPslJfmvdCvqtVc=", - "owner": "hyprwm", - "repo": "hyprgraphics", - "rev": "c6e7b9f673f4360bc813d3dc75028f75ee88d3f8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprgraphics", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprgraphics": "hyprgraphics", - "hyprland-guiutils": "hyprland-guiutils", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "hyprwire": "hyprwire", - "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1784303676, - "narHash": "sha256-yjLMggvtVM67XDngpjIGZnmM8uGEjYXHHN+z+UP6F4I=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "4afc273db287ad4069cc8ab3edff4a09c31d3410", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-guiutils": { - "inputs": { - "aquamarine": [ - "hyprland", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprtoolkit": "hyprtoolkit", - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1782563850, - "narHash": "sha256-rs/EzgrgPHbCtJjFZN4aR1HYldH/0NtGAempWVpWQTs=", - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "rev": "5ba080ee036c30cb2485f2647ff8a61f7aa08178", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-guiutils", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1772460177, - "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1777320127, - "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprtoolkit": { - "inputs": { - "aquamarine": [ - "hyprland", - "hyprland-guiutils", - "aquamarine" - ], - "hyprgraphics": [ - "hyprland", - "hyprland-guiutils", - "hyprgraphics" - ], - "hyprlang": [ - "hyprland", - "hyprland-guiutils", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-guiutils", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland-guiutils", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "hyprland-guiutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-guiutils", - "systems" - ] - }, - "locked": { - "lastModified": 1782554491, - "narHash": "sha256-+p3MlyN/nqRefcf2IckPlGRUn9+hielqpS9XClbLleM=", - "owner": "hyprwm", - "repo": "hyprtoolkit", - "rev": "bdba25ced39ea39ab004a8f31593ba0b0ff1ca35", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprtoolkit", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1783002634, - "narHash": "sha256-xGqHIUK0wIZoW7SiMalwvO6uGOO/VrlQwoRobpE7dDI=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "41fb809557abd29a57151b6e1aaeabd05f9437e1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1777159683, - "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwire": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1778410714, - "narHash": "sha256-o6RzFj4nJXaPRY7EM01siuCQeT41RfwwmcmFQqwFJJg=", - "owner": "hyprwm", - "repo": "hyprwire", - "rev": "85148a8e612808cf5ddb25d0b3c5840f3498a7dc", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwire", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -678,7 +310,7 @@ }, "nixcord": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" @@ -701,16 +333,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783522502, - "narHash": "sha256-iffAls3iaNTyJC2faYcUXSI+Gp02cDjYl+MygxKl2GI=", - "owner": "NixOS", + "lastModified": 1784210874, + "narHash": "sha256-x8i+HYAulduMlM63oxWJj5tAm+Sc/W756wUzcV5p24w=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "0bb7ec54c8483066ec9d7720e780a5caa71f8612", + "rev": "59682e0069f0ed0a452e2179a7f4c1f247027b9e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -747,22 +379,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1784210874, - "narHash": "sha256-x8i+HYAulduMlM63oxWJj5tAm+Sc/W756wUzcV5p24w=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "59682e0069f0ed0a452e2179a7f4c1f247027b9e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1783915482, "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", @@ -781,8 +397,8 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", - "systems": "systems_2" + "nixpkgs": "nixpkgs_2", + "systems": "systems" }, "locked": { "lastModified": 1784057377, @@ -825,7 +441,7 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -846,36 +462,13 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1783008725, - "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", - "hyprland": "hyprland", "lanzaboote": "lanzaboote", "nix-easyroam": "nix-easyroam", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixvim": "nixvim", "stylix": "stylix" } @@ -914,7 +507,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_3", + "systems": "systems_2", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -935,21 +528,6 @@ } }, "systems": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1774449309, "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", @@ -965,7 +543,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1043,47 +621,6 @@ "repo": "base16-zed", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1782644412, - "narHash": "sha256-/iSa/bL1QQFLv+uJ9gI0N87J8gOeZXvca7EjoPGKE6w=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "c01c99fc278ec68c82e9865923088f043c7c1621", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index dc97b5f..6db0837 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,6 @@ url = "github:nix-community/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland.url = "github:hyprwm/Hyprland"; lanzaboote = { url = "github:nix-community/lanzaboote/v1.1.0"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/hyprland.lua b/home/hyprland.lua index 45b217f..87a7604 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -42,8 +42,8 @@ hl.config({ }, decoration = { - rounding = 20, - rounding_power = 3, + rounding = 18, + rounding_power = 2, active_opacity = 1.0, inactive_opacity = 1.0, shadow = { diff --git a/home/hyprland.nix b/home/hyprland.nix index a137095..50c016d 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -13,7 +13,7 @@ require("main") ''; portalPackage = - inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + pkgs.xdg-desktop-portal-hyprland; }; xdg.configFile."hypr/main.lua".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos/home/hyprland.lua"; diff --git a/stylix.nix b/stylix.nix index 961b7c1..1088e37 100644 --- a/stylix.nix +++ b/stylix.nix @@ -24,7 +24,7 @@ stylix = { enable = true; autoEnable = false; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; polarity = "dark"; image = ./wallpaper.png; targets = { From 782387d9dd84338e0c94974369b09ba9d3c9d2ec Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 18 Jul 2026 21:05:06 +0200 Subject: [PATCH 28/57] move power management options to laptop flake --- configuration.nix | 17 +--------- flake.nix | 22 ++++++++----- hardware-configuration-desktop.nix | 50 ------------------------------ hardware-configuration-laptop.nix | 33 -------------------- 4 files changed, 16 insertions(+), 106 deletions(-) delete mode 100644 hardware-configuration-desktop.nix delete mode 100644 hardware-configuration-laptop.nix diff --git a/configuration.nix b/configuration.nix index 3478218..569e0db 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,7 +8,7 @@ imports = [ ./stylix.nix ./nixvim/nixvim.nix - + /etc/nixos/hardware-configuration.nix ]; boot.loader.systemd-boot.enable = true; @@ -36,26 +36,11 @@ LC_TELEPHONE = "de_DE.UTF-8"; LC_TIME = "de_DE.UTF-8"; }; - services.upower.enable = true; - services.tlp = { - enable = true; - settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - CPU_MIN_PERF_ON_AC = 0; - CPU_MAX_PERF_ON_AC = 100; - CPU_MIN_PERF_ON_BAT = 0; - CPU_MAX_PERF_ON_BAT = 20; - }; - }; services.xserver.xkb = { layout = "eu"; variant = ""; }; services.displayManager.ly.enable = true; - powerManagement.powertop.enable = true; programs.hyprland = { package = pkgs.hyprland; enable = true; diff --git a/flake.nix b/flake.nix index 6db0837..a1db0b6 100644 --- a/flake.nix +++ b/flake.nix @@ -57,10 +57,21 @@ } ({ lib, ... }: { networking.hostName = lib.mkForce "seele"; - imports = [ - ./hardware-configuration-laptop.nix - ]; - + powerManagement.powertop.enable = true; + services.upower.enable = true; + services.tlp = { + enable = true; + settings = { + CPU_SCALING_GOVERNOR_ON_AC = "performance"; + CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; + CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; + CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + CPU_MIN_PERF_ON_AC = 0; + CPU_MAX_PERF_ON_AC = 100; + CPU_MIN_PERF_ON_BAT = 0; + CPU_MAX_PERF_ON_BAT = 20; + }; + }; }) ]; @@ -82,9 +93,6 @@ } ({ pkgs, lib, ... }: { - imports = [ - ./hardware-configuration-desktop.nix - ]; networking.hostName = lib.mkForce "nerv"; environment.systemPackages = [ # For debugging and troubleshooting Secure Boot. diff --git a/hardware-configuration-desktop.nix b/hardware-configuration-desktop.nix deleted file mode 100644 index da5f51c..0000000 --- a/hardware-configuration-desktop.nix +++ /dev/null @@ -1,50 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: - -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ - "nvme" - "ahci" - "xhci_pci" - "usbhid" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/64a37727-0c5f-41d4-afac-dc26978916c1"; - fsType = "xfs"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/F424-0E3E"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - - swapDevices = [ ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - services.xserver.videoDrivers = [ "nvidia" ]; - hardware.nvidia.open = true; # see the note above - boot.loader.systemd-boot.configurationLimit = 5; -} diff --git a/hardware-configuration-laptop.nix b/hardware-configuration-laptop.nix deleted file mode 100644 index c3d407a..0000000 --- a/hardware-configuration-laptop.nix +++ /dev/null @@ -1,33 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/624609f3-6d1c-4e9c-adcb-0c4d66de25c3"; - fsType = "xfs"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/298C-5081"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/9d98be55-ea0d-465f-967e-29c83c4127a9"; } - ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} From c0972def8c0eca7ecf69b2a5d04226bd76bf05ec Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 18 Jul 2026 21:56:22 +0200 Subject: [PATCH 29/57] add systemD boot config --- configuration.nix | 6 ++++-- flake.nix | 37 +++++++++++++++++++++++++------------ home/hyprland.lua | 2 +- 3 files changed, 30 insertions(+), 15 deletions(-) diff --git a/configuration.nix b/configuration.nix index 569e0db..165c19a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,7 +1,6 @@ { config, pkgs, - inputs, ... }: { @@ -11,7 +10,10 @@ /etc/nixos/hardware-configuration.nix ]; - boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot = { + edk2-uefi-shell.enable = true; + configurationLimit = 5; + }; boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages; nix.settings.experimental-features = [ diff --git a/flake.nix b/flake.nix index a1db0b6..4ab80e3 100644 --- a/flake.nix +++ b/flake.nix @@ -92,19 +92,32 @@ home-manager.extraSpecialArgs = { inherit inputs; }; } - ({ pkgs, lib, ... }: { - networking.hostName = lib.mkForce "nerv"; - environment.systemPackages = [ - # For debugging and troubleshooting Secure Boot. - pkgs.sbctl - ]; - boot.loader.systemd-boot.enable = lib.mkForce false; + ( + { + config, + pkgs, + lib, + ... + }: + { + networking.hostName = lib.mkForce "nerv"; + environment.systemPackages = [ + pkgs.sbctl + ]; + boot.loader.systemd-boot.enable = lib.mkForce false; + services.xserver.videoDrivers = [ "nvidia" ]; + hardware.nvidia = { + modesetting.enable = true; + open = true; + package = config.boot.kernelPackages.nvidiaPackages.latest; + }; - boot.lanzaboote = { - enable = true; - pkiBundle = "/var/lib/sbctl"; - }; - }) + boot.lanzaboote = { + enable = true; + pkiBundle = "/var/lib/sbctl"; + }; + } + ) ]; }; }; diff --git a/home/hyprland.lua b/home/hyprland.lua index 87a7604..2c11d4d 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -14,7 +14,7 @@ hl.monitor({ cm = "wide", }) hl.monitor({ - output = "DP-2", + output = "DP-5", mode = "2560x1440@165", position = "auto", scale = "1", From c4cc430c066661a4193ee1f1be450fad32b48fa8 Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 19 Jul 2026 01:46:06 +0200 Subject: [PATCH 30/57] fix laptop part of flake --- configuration.nix | 11 ++++++++--- flake.nix | 1 + home/home.nix | 7 +++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 165c19a..3555fd4 100644 --- a/configuration.nix +++ b/configuration.nix @@ -63,9 +63,14 @@ } ]; - programs.bash.interactiveShellInit = '' - complete -F _command doas - ''; + programs.bash = { + promptInit = '' + PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' + ''; + interactiveShellInit = '' + complete -F _command doas + ''; + }; # Enable CUPS to print documents. services.printing.enable = true; diff --git a/flake.nix b/flake.nix index 4ab80e3..aee2a35 100644 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,7 @@ home-manager.extraSpecialArgs = { inherit inputs; }; } ({ lib, ... }: { + boot.loader.systemd-boot.enable = true; networking.hostName = lib.mkForce "seele"; powerManagement.powertop.enable = true; services.upower.enable = true; diff --git a/home/home.nix b/home/home.nix index d45375a..8e15dee 100644 --- a/home/home.nix +++ b/home/home.nix @@ -53,10 +53,9 @@ programs.bash = { enable = true; enableCompletion = true; - bashrcExtra = '' - PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' - ''; - + shellAliases = { + "rebuild" = "doas nixos-rebuild switch --flake $HOME/nixos/ --impure"; + }; }; programs.google-chrome.enable = true; programs.foot = { From f2260c6eaf5d19343f697379263e80a86232a997 Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 19 Jul 2026 10:32:20 +0200 Subject: [PATCH 31/57] add res forcing for pc --- flake.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index aee2a35..a2cb9e6 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ home-manager.extraSpecialArgs = { inherit inputs; }; } ({ lib, ... }: { - boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot.enable = true; networking.hostName = lib.mkForce "seele"; powerManagement.powertop.enable = true; services.upower.enable = true; @@ -102,9 +102,23 @@ }: { networking.hostName = lib.mkForce "nerv"; + systemd.services.fbcon-native = { + description = "Force framebuffer console to native resolution"; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; + before = [ "display-manager.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = "${pkgs.fbset}/bin/fbset -xres 2560 -yres 1440 -match --all"; + }; + }; environment.systemPackages = [ pkgs.sbctl ]; + boot.kernelParams = [ + "video=card2-DP-5:2560x1440@60" + ]; boot.loader.systemd-boot.enable = lib.mkForce false; services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia = { From 26d45c8fffda2b013589a124ddaa8215b2edac24 Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 19 Jul 2026 15:06:15 +0200 Subject: [PATCH 32/57] add gitgnore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..301d47e --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +flake.lock From 04e8785836aa320c8a6196536044868acceee13a Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 19 Jul 2026 15:08:22 +0200 Subject: [PATCH 33/57] update gitignore --- .gitignore | 2 +- flake.lock | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 301d47e..de506ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -flake.lock +./flake.lock diff --git a/flake.lock b/flake.lock index d3bfde8..094d48b 100644 --- a/flake.lock +++ b/flake.lock @@ -251,11 +251,11 @@ ] }, "locked": { - "lastModified": 1784129366, - "narHash": "sha256-N5JiyICSeQF14x+OQebNyPpYowOT9Rs1iKyeCylSzOA=", + "lastModified": 1784407317, + "narHash": "sha256-iZrxHToDJWnvt+5LGAtvuQMTy1NZYlNEKbKaVtBJNcc=", "owner": "nix-community", "repo": "home-manager", - "rev": "165228b0efefc3e635e5174020c40ea64271dc25", + "rev": "39411a8e12a5526d992e65bc7e3dc9a4414d6713", "type": "github" }, "original": { @@ -318,11 +318,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1784310259, - "narHash": "sha256-i6GIP3d+M5z2h72GsO6TBehImXau/VBBdZwCRiadAu0=", + "lastModified": 1784459605, + "narHash": "sha256-xHONoLYkzO3Ab8OLRWChCufW+d7tBkFfshd0rrrzrTg=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "bf7b06ce5ca24e43829e53183899912af2722c6c", + "rev": "768c334b027ceaae77315054f92891e1920cae01", "type": "github" }, "original": { @@ -333,11 +333,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1784210874, - "narHash": "sha256-x8i+HYAulduMlM63oxWJj5tAm+Sc/W756wUzcV5p24w=", + "lastModified": 1784364478, + "narHash": "sha256-CdItYNdYUlm7NxqMVyQKqT2IxTwvapiPuRLWOyHTrbY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "59682e0069f0ed0a452e2179a7f4c1f247027b9e", + "rev": "20535e48e12c86043b577b8518234ff5dbb26957", "type": "github" }, "original": { @@ -364,11 +364,11 @@ }, "nixpkgs-nixcord": { "locked": { - "lastModified": 1782999065, - "narHash": "sha256-5Dgj5+pIQYZKrXUGaLCk7CKfN3MmpwIhO94++WVxvng=", + "lastModified": 1784160687, + "narHash": "sha256-iYL/bixrb6FlHFu/gIuBYzq6c6lM5AAXsXNSWXtIgQc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80d591ed473cfc46329932c2aadac9b435342c7c", + "rev": "4382ed2b7a6839d4280a9b386db49cbc5907414d", "type": "github" }, "original": { From 685ee016190cde2bdca686f7b7ada064bfd02672 Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 19 Jul 2026 15:10:20 +0200 Subject: [PATCH 34/57] update gitignore again --- .gitignore | 2 +- flake.lock | 628 ----------------------------------------------------- 2 files changed, 1 insertion(+), 629 deletions(-) delete mode 100644 flake.lock diff --git a/.gitignore b/.gitignore index de506ce..301d47e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -./flake.lock +flake.lock diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 094d48b..0000000 --- a/flake.lock +++ /dev/null @@ -1,628 +0,0 @@ -{ - "nodes": { - "base16": { - "inputs": { - "fromYaml": "fromYaml" - }, - "locked": { - "lastModified": 1755819240, - "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", - "owner": "SenchoPens", - "repo": "base16.nix", - "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "base16.nix", - "type": "github" - } - }, - "base16-fish": { - "flake": false, - "locked": { - "lastModified": 1765809053, - "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", - "owner": "tomyun", - "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", - "type": "github" - }, - "original": { - "owner": "tomyun", - "repo": "base16-fish", - "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", - "type": "github" - } - }, - "base16-helix": { - "flake": false, - "locked": { - "lastModified": 1776754714, - "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", - "owner": "tinted-theming", - "repo": "base16-helix", - "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-helix", - "type": "github" - } - }, - "base16-vim": { - "flake": false, - "locked": { - "lastModified": 1732806396, - "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-vim", - "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", - "type": "github" - } - }, - "crane": { - "locked": { - "lastModified": 1781825982, - "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", - "owner": "ipetkov", - "repo": "crane", - "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "firefox-gnome-theme": { - "flake": false, - "locked": { - "lastModified": 1779670703, - "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", - "type": "github" - }, - "original": { - "owner": "rafaelmardojai", - "repo": "firefox-gnome-theme", - "type": "github" - } - }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "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" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1782949081, - "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "fromYaml": { - "flake": false, - "locked": { - "lastModified": 1731966426, - "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", - "owner": "SenchoPens", - "repo": "fromYaml", - "rev": "106af9e2f715e2d828df706c386a685698f3223b", - "type": "github" - }, - "original": { - "owner": "SenchoPens", - "repo": "fromYaml", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "pre-commit", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gnome-shell": { - "flake": false, - "locked": { - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" - }, - "original": { - "owner": "GNOME", - "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1784407317, - "narHash": "sha256-iZrxHToDJWnvt+5LGAtvuQMTy1NZYlNEKbKaVtBJNcc=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "39411a8e12a5526d992e65bc7e3dc9a4414d6713", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "lanzaboote": { - "inputs": { - "crane": "crane", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit": "pre-commit", - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1782141370, - "narHash": "sha256-hqijVSEETttmo8Okql9/LG0Ua34hdciKW1a5zzlj8mU=", - "owner": "nix-community", - "repo": "lanzaboote", - "rev": "7c9a54a7f87b4539ddbd8bda09a8a5f5f9361aa9", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "v1.1.0", - "repo": "lanzaboote", - "type": "github" - } - }, - "nix-easyroam": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1784038797, - "narHash": "sha256-td6Ko5RV/TFw7ALmYP9YUVXMS1b7hW7vDqabrGXyzUo=", - "owner": "0x5a4", - "repo": "nix-easyroam", - "rev": "a6c72d25edc3b210bf6b2b46395c88be7efac147", - "type": "github" - }, - "original": { - "owner": "0x5a4", - "repo": "nix-easyroam", - "type": "github" - } - }, - "nixcord": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-nixcord": "nixpkgs-nixcord" - }, - "locked": { - "lastModified": 1784459605, - "narHash": "sha256-xHONoLYkzO3Ab8OLRWChCufW+d7tBkFfshd0rrrzrTg=", - "owner": "FlameFlag", - "repo": "nixcord", - "rev": "768c334b027ceaae77315054f92891e1920cae01", - "type": "github" - }, - "original": { - "owner": "FlameFlag", - "repo": "nixcord", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1784364478, - "narHash": "sha256-CdItYNdYUlm7NxqMVyQKqT2IxTwvapiPuRLWOyHTrbY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "20535e48e12c86043b577b8518234ff5dbb26957", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1782614948, - "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-nixcord": { - "locked": { - "lastModified": 1784160687, - "narHash": "sha256-iYL/bixrb6FlHFu/gIuBYzq6c6lM5AAXsXNSWXtIgQc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4382ed2b7a6839d4280a9b386db49cbc5907414d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1783915482, - "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2", - "systems": "systems" - }, - "locked": { - "lastModified": 1784057377, - "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "07180a087e4a00720dc0731cbcd8dec796974381", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nur": { - "inputs": { - "flake-parts": [ - "stylix", - "flake-parts" - ], - "nixpkgs": [ - "stylix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1780281641, - "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", - "owner": "nix-community", - "repo": "NUR", - "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "pre-commit": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1781733627, - "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "lanzaboote": "lanzaboote", - "nix-easyroam": "nix-easyroam", - "nixcord": "nixcord", - "nixpkgs": "nixpkgs", - "nixvim": "nixvim", - "stylix": "stylix" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1782012058, - "narHash": "sha256-9mWUnReOUXfKjZuJAL/bAFH3LUyECTRtXgSNVjRw3UY=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "8534567325bd8a8d2928e6afd81e0a87d19efd3c", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "stylix": { - "inputs": { - "base16": "base16", - "base16-fish": "base16-fish", - "base16-helix": "base16-helix", - "base16-vim": "base16-vim", - "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_3", - "gnome-shell": "gnome-shell", - "nixpkgs": [ - "nixpkgs" - ], - "nur": "nur", - "systems": "systems_2", - "tinted-kitty": "tinted-kitty", - "tinted-schemes": "tinted-schemes", - "tinted-tmux": "tinted-tmux", - "tinted-zed": "tinted-zed" - }, - "locked": { - "lastModified": 1784059683, - "narHash": "sha256-q5MZrmKlg9A4ORx3EQcr7qkuidMU1gVZ+xJ3nCK+xgc=", - "owner": "nix-community", - "repo": "stylix", - "rev": "c8ccc31f3ea29dc3eb5b54945e5eb549529491d6", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "stylix", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1774449309, - "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", - "owner": "nix-systems", - "repo": "default", - "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "ref": "future-26.11", - "repo": "default", - "type": "github" - } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "tinted-kitty": { - "flake": false, - "locked": { - "lastModified": 1735730497, - "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", - "owner": "tinted-theming", - "repo": "tinted-kitty", - "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-kitty", - "type": "github" - } - }, - "tinted-schemes": { - "flake": false, - "locked": { - "lastModified": 1777806186, - "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", - "owner": "tinted-theming", - "repo": "schemes", - "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "schemes", - "type": "github" - } - }, - "tinted-tmux": { - "flake": false, - "locked": { - "lastModified": 1778379944, - "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", - "owner": "tinted-theming", - "repo": "tinted-tmux", - "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "tinted-tmux", - "type": "github" - } - }, - "tinted-zed": { - "flake": false, - "locked": { - "lastModified": 1778378178, - "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", - "owner": "tinted-theming", - "repo": "base16-zed", - "rev": "9cd816033ff969415b190722cddf134e78a5665f", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-zed", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} From 5fca60fb3df748cc46b477c4df993304f7912b35 Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 22 Jul 2026 01:39:03 +0200 Subject: [PATCH 35/57] add git config --- home/home.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index 8e15dee..395232f 100644 --- a/home/home.nix +++ b/home/home.nix @@ -15,7 +15,6 @@ # paths it should manage. home.packages = with pkgs; [ xournalpp - git spotify fastfetch hyfetch @@ -38,6 +37,18 @@ }; }; }; + programs.git = { + enable = true; + settings = { + user = { + user.name = "lucy"; + user.email = "lucykaufmann@protonmail.com"; + }; + }; + extraConfig = { + init.defaultBranch = "main"; + }; + }; programs.quickshell.enable = true; programs.fuzzel.enable = true; programs.nixcord = { From a37905dd178981701f97145f3323723f73e9052a Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 22 Jul 2026 01:39:22 +0200 Subject: [PATCH 36/57] add git config --- home/home.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/home/home.nix b/home/home.nix index 395232f..9adb0ba 100644 --- a/home/home.nix +++ b/home/home.nix @@ -40,10 +40,8 @@ programs.git = { enable = true; settings = { - user = { - user.name = "lucy"; - user.email = "lucykaufmann@protonmail.com"; - }; + user.name = "lucy"; + user.email = "lucykaufmann@protonmail.com"; }; extraConfig = { init.defaultBranch = "main"; From 992e2bd1915f4f35f7619ee23c7602d1fd38ee87 Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 22 Jul 2026 01:40:21 +0200 Subject: [PATCH 37/57] remove gitignore file --- .gitignore | 1 - flake.lock | 628 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 628 insertions(+), 1 deletion(-) delete mode 100644 .gitignore create mode 100644 flake.lock diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 301d47e..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..c9e272e --- /dev/null +++ b/flake.lock @@ -0,0 +1,628 @@ +{ + "nodes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1765809053, + "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1776754714, + "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + } + }, + "crane": { + "locked": { + "lastModified": 1781825982, + "narHash": "sha256-SlXKwIRIhrOSAcTjCB3ftPLzJWZStQIPS7J1FlZPnKk=", + "owner": "ipetkov", + "repo": "crane", + "rev": "469fd08d0bcf6926321fa973c6777fbc87785dd7", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1779670703, + "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "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" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "pre-commit", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1767737596, + "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" + }, + "original": { + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "ef02db02bf0ff342734d525b5767814770d85b49", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1784588016, + "narHash": "sha256-ouZe80aWEhMLVMkqICFDN+JUw+0FJtCr/bh+hHtRtMg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "deeb6b7eb7e0c44ae1819c051ce175bd92a85100", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "lanzaboote": { + "inputs": { + "crane": "crane", + "nixpkgs": [ + "nixpkgs" + ], + "pre-commit": "pre-commit", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1782141370, + "narHash": "sha256-hqijVSEETttmo8Okql9/LG0Ua34hdciKW1a5zzlj8mU=", + "owner": "nix-community", + "repo": "lanzaboote", + "rev": "7c9a54a7f87b4539ddbd8bda09a8a5f5f9361aa9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v1.1.0", + "repo": "lanzaboote", + "type": "github" + } + }, + "nix-easyroam": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1784038797, + "narHash": "sha256-td6Ko5RV/TFw7ALmYP9YUVXMS1b7hW7vDqabrGXyzUo=", + "owner": "0x5a4", + "repo": "nix-easyroam", + "rev": "a6c72d25edc3b210bf6b2b46395c88be7efac147", + "type": "github" + }, + "original": { + "owner": "0x5a4", + "repo": "nix-easyroam", + "type": "github" + } + }, + "nixcord": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-nixcord": "nixpkgs-nixcord" + }, + "locked": { + "lastModified": 1784664390, + "narHash": "sha256-4BmnQXaymwv0Hp6abCyJ4FA6lhv/MJqACgiWx5Wg5MQ=", + "owner": "FlameFlag", + "repo": "nixcord", + "rev": "61b997cc4fdea60a53213bb66298bfcdb408dcfc", + "type": "github" + }, + "original": { + "owner": "FlameFlag", + "repo": "nixcord", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1784555310, + "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1782614948, + "narHash": "sha256-ePjCwr1sNm9NYUqywL7QfK3JnlS015msC+eBu2zKlp8=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "db3f255737b94216eb71cce308e2912cf6bc2d7c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-nixcord": { + "locked": { + "lastModified": 1784160687, + "narHash": "sha256-iYL/bixrb6FlHFu/gIuBYzq6c6lM5AAXsXNSWXtIgQc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4382ed2b7a6839d4280a9b386db49cbc5907414d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1783915482, + "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixvim": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2", + "systems": "systems" + }, + "locked": { + "lastModified": 1784057377, + "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=", + "owner": "nix-community", + "repo": "nixvim", + "rev": "07180a087e4a00720dc0731cbcd8dec796974381", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixvim", + "type": "github" + } + }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780281641, + "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", + "owner": "nix-community", + "repo": "NUR", + "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, + "pre-commit": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1781733627, + "narHash": "sha256-U3yTuGBnmXvXoQI3qkpfEDsn9RovQPAjN7ndRco+3u0=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "3bbec39bc90eadfa031e6f3b77272f3f60803e39", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "lanzaboote": "lanzaboote", + "nix-easyroam": "nix-easyroam", + "nixcord": "nixcord", + "nixpkgs": "nixpkgs", + "nixvim": "nixvim", + "stylix": "stylix" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1782012058, + "narHash": "sha256-9mWUnReOUXfKjZuJAL/bAFH3LUyECTRtXgSNVjRw3UY=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "8534567325bd8a8d2928e6afd81e0a87d19efd3c", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-parts": "flake-parts_3", + "gnome-shell": "gnome-shell", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "systems": "systems_2", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1784059683, + "narHash": "sha256-q5MZrmKlg9A4ORx3EQcr7qkuidMU1gVZ+xJ3nCK+xgc=", + "owner": "nix-community", + "repo": "stylix", + "rev": "c8ccc31f3ea29dc3eb5b54945e5eb549529491d6", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "stylix", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1774449309, + "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", + "owner": "nix-systems", + "repo": "default", + "rev": "c29398b59d2048c4ab79345812849c9bd15e9150", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "ref": "future-26.11", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1777806186, + "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1778379944, + "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1778378178, + "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "9cd816033ff969415b190722cddf134e78a5665f", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} From e6c8afe447fa389991182063cd0f1e719aaebbe7 Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 22 Jul 2026 01:42:02 +0200 Subject: [PATCH 38/57] fix git config --- home/home.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/home/home.nix b/home/home.nix index 9adb0ba..38ec08a 100644 --- a/home/home.nix +++ b/home/home.nix @@ -42,8 +42,6 @@ settings = { user.name = "lucy"; user.email = "lucykaufmann@protonmail.com"; - }; - extraConfig = { init.defaultBranch = "main"; }; }; From 092746e1504e6cc6c2729f28f62f4e96bf6dfeab Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 22 Jul 2026 13:19:12 +0200 Subject: [PATCH 39/57] remove framebuffer res service --- flake.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/flake.nix b/flake.nix index a2cb9e6..8b7226f 100644 --- a/flake.nix +++ b/flake.nix @@ -102,17 +102,6 @@ }: { networking.hostName = lib.mkForce "nerv"; - systemd.services.fbcon-native = { - description = "Force framebuffer console to native resolution"; - wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; - before = [ "display-manager.service" ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - ExecStart = "${pkgs.fbset}/bin/fbset -xres 2560 -yres 1440 -match --all"; - }; - }; environment.systemPackages = [ pkgs.sbctl ]; From 9bd4826cb6a3d74ce73da3604c64d75298a67a8c Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 23 Jul 2026 15:02:52 +0200 Subject: [PATCH 40/57] add devenv and switch to plugin for prettier colors --- configuration.nix | 1 + stylix.nix | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 3555fd4..b3fa705 100644 --- a/configuration.nix +++ b/configuration.nix @@ -164,6 +164,7 @@ grimblast git blueman + devenv ]; hardware.bluetooth = { enable = true; diff --git a/stylix.nix b/stylix.nix index 1088e37..275c761 100644 --- a/stylix.nix +++ b/stylix.nix @@ -32,7 +32,10 @@ gtk.enable = true; qt.enable = true; qt.platform = lib.mkForce "qtct"; - nixvim.enable = true; + nixvim = { + enable = true; + plugin = "base16-nvim"; + }; }; fonts = { sizes = { From 1fdebac78773d82a1c761081e47f48b9321987fd Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 23 Jul 2026 15:16:43 +0200 Subject: [PATCH 41/57] move bash config to configuration.ix and add devenv hook --- configuration.nix | 5 +++++ home/home.nix | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index b3fa705..287f226 100644 --- a/configuration.nix +++ b/configuration.nix @@ -64,11 +64,16 @@ ]; programs.bash = { + completion.enable = true; + shellAliases = { + "rebuild" = "doas nixos-rebuild switch --flake $HOME/nixos/ --impure"; + }; promptInit = '' PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' ''; interactiveShellInit = '' complete -F _command doas + eval "$(devenv hook bash)" ''; }; # Enable CUPS to print documents. diff --git a/home/home.nix b/home/home.nix index 38ec08a..7887db7 100644 --- a/home/home.nix +++ b/home/home.nix @@ -57,13 +57,6 @@ }; }; }; - programs.bash = { - enable = true; - enableCompletion = true; - shellAliases = { - "rebuild" = "doas nixos-rebuild switch --flake $HOME/nixos/ --impure"; - }; - }; programs.google-chrome.enable = true; programs.foot = { enable = true; From 3ae45e8ce73407e24fca1d046e00142010f85336 Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 23 Jul 2026 15:22:52 +0200 Subject: [PATCH 42/57] make foot padding bigger --- home/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index 7887db7..40bd548 100644 --- a/home/home.nix +++ b/home/home.nix @@ -62,7 +62,7 @@ enable = true; settings = { main = { - pad = "10x10"; + pad = "20x20"; }; }; }; From 6771d059ae6f8b4cb968c647b4f8776e5a29f0fc Mon Sep 17 00:00:00 2001 From: lucy Date: Thu, 23 Jul 2026 16:07:33 +0200 Subject: [PATCH 43/57] shit fuck --- stylix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylix.nix b/stylix.nix index 275c761..879a77d 100644 --- a/stylix.nix +++ b/stylix.nix @@ -24,7 +24,7 @@ stylix = { enable = true; autoEnable = false; - base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; polarity = "dark"; image = ./wallpaper.png; targets = { From 3ee6ff9a5589b6c09bc7b5083ccf8890eeb4a85c Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 24 Jul 2026 21:26:35 +0200 Subject: [PATCH 44/57] go to linux kernel 7 and enable steam --- configuration.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 287f226..9cd1fc6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -15,7 +15,7 @@ configurationLimit = 5; }; boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages; + boot.kernelPackages = pkgs.linuxPackages_latest; nix.settings.experimental-features = [ "nix-command" "flakes" @@ -43,6 +43,12 @@ variant = ""; }; services.displayManager.ly.enable = true; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + }; programs.hyprland = { package = pkgs.hyprland; enable = true; @@ -170,6 +176,8 @@ git blueman devenv + inetutils + filezilla ]; hardware.bluetooth = { enable = true; From 34aefaa867755fbafb15f9b06a605b3a877595e2 Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 24 Jul 2026 21:56:40 +0200 Subject: [PATCH 45/57] create hw configs folder and remove iosevka --- configuration.nix | 37 ----------------- flake.lock | 92 ++++++++++++++++++++++--------------------- flake.nix | 1 + hw-configs/laptop.nix | 33 ++++++++++++++++ stylix.nix | 3 +- 5 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 hw-configs/laptop.nix diff --git a/configuration.nix b/configuration.nix index 9cd1fc6..531818e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -7,7 +7,6 @@ imports = [ ./stylix.nix ./nixvim/nixvim.nix - /etc/nixos/hardware-configuration.nix ]; boot.loader.systemd-boot = { @@ -116,42 +115,6 @@ noto-fonts noto-fonts-cjk-sans noto-fonts-color-emoji - (iosevka.override { - set = "Custom"; - privateBuildPlan = '' - [buildPlans.IosevkaCustom] - family = "Iosevka Custom" - spacing = "fontconfig-mono" - serifs = "slab" - noCvSs = true - exportGlyphNames = false - - [buildPlans.IosevkaCustom.variants] - inherits = "ss12" - - [buildPlans.IosevkaCustom.weights.Regular] - shape = 400 - menu = 400 - css = 400 - - [buildPlans.IosevkaCustom.weights.Bold] - shape = 700 - menu = 700 - css = 700 - - [buildPlans.IosevkaCustom.slopes.Upright] - angle = 0 - shape = "upright" - menu = "upright" - css = "normal" - - [buildPlans.IosevkaCustom.slopes.Italic] - angle = 9.4 - shape = "italic" - menu = "italic" - css = "italic" - ''; - }) nerd-fonts.symbols-only ]; users.users."lucy" = { diff --git a/flake.lock b/flake.lock index c9e272e..dcc6199 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1779670703, - "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", + "lastModified": 1782007937, + "narHash": "sha256-PbnJr+eB+9Czol3ReI83dUgEhcn0sDK6TSy6ODTQm88=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", + "rev": "981bd332015397fb1ca033fa982bd61635160c78", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "lastModified": 1782949081, + "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "type": "github" }, "original": { @@ -230,18 +230,20 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1767737596, - "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", + "host": "gitlab.gnome.org", + "lastModified": 1776175984, + "narHash": "sha256-RJFlFW8GiMei6oqUGrMkGEvVqOH8U7Q8abc1yK4VKD8=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "rev": "e0fdc4c13250e9a9b8ea9594c83925274f4a5dca", + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", + "ref": "50.1", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -251,11 +253,11 @@ ] }, "locked": { - "lastModified": 1784588016, - "narHash": "sha256-ouZe80aWEhMLVMkqICFDN+JUw+0FJtCr/bh+hHtRtMg=", + "lastModified": 1784913159, + "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "deeb6b7eb7e0c44ae1819c051ce175bd92a85100", + "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d", "type": "github" }, "original": { @@ -318,11 +320,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1784664390, - "narHash": "sha256-4BmnQXaymwv0Hp6abCyJ4FA6lhv/MJqACgiWx5Wg5MQ=", + "lastModified": 1784915044, + "narHash": "sha256-i/1GB/YbjXWYbSdh+nh/wCvvCU78mMkfuPmCNRAbJZE=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "61b997cc4fdea60a53213bb66298bfcdb408dcfc", + "rev": "f8de57863e0a4aad7e64c1ad00d56d5f925b9bf1", "type": "github" }, "original": { @@ -333,11 +335,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1784555310, - "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", + "lastModified": 1784783405, + "narHash": "sha256-4IHyyLgLBdKefkljdKod4IMn023pQiDXAWJA187cmdY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", + "rev": "7525d999cd850b9a488817abc89c75dc733acf17", "type": "github" }, "original": { @@ -364,11 +366,11 @@ }, "nixpkgs-nixcord": { "locked": { - "lastModified": 1784160687, - "narHash": "sha256-iYL/bixrb6FlHFu/gIuBYzq6c6lM5AAXsXNSWXtIgQc=", + "lastModified": 1784432872, + "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4382ed2b7a6839d4280a9b386db49cbc5907414d", + "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870", "type": "github" }, "original": { @@ -380,11 +382,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1783915482, - "narHash": "sha256-FmieJB8/OUvNxbkboi7+IGfIuSXY3nF/hZQm8kD0r50=", + "lastModified": 1784555310, + "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6cdc7fc76e8bf7fde9fa43a849fcaaa70e230dee", + "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", "type": "github" }, "original": { @@ -401,11 +403,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1784057377, - "narHash": "sha256-yycNej5//EsRbV10moBoh+/63vXEwZD1ZFEiRm6C9rQ=", + "lastModified": 1784814601, + "narHash": "sha256-T32JXjZ7kIbhBn8/Har171yGg6IBdl97cxAWameqZDE=", "owner": "nix-community", "repo": "nixvim", - "rev": "07180a087e4a00720dc0731cbcd8dec796974381", + "rev": "f316e949e0ed9df0e1e0bf645c6dce721d4e230e", "type": "github" }, "original": { @@ -426,11 +428,11 @@ ] }, "locked": { - "lastModified": 1780281641, - "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", + "lastModified": 1783439237, + "narHash": "sha256-WUr8JF2v3n4Y30E5dxv4sAgNJXpVDBoCQNoQ/V4+n4o=", "owner": "nix-community", "repo": "NUR", - "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", + "rev": "b70bb66c7bcd162642f3a609bc16843c7059f503", "type": "github" }, "original": { @@ -514,11 +516,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1784059683, - "narHash": "sha256-q5MZrmKlg9A4ORx3EQcr7qkuidMU1gVZ+xJ3nCK+xgc=", + "lastModified": 1784676123, + "narHash": "sha256-ndyanKzw90yX2nUVFmTuYqXidUNymtMfgmIHyNdhht0=", "owner": "nix-community", "repo": "stylix", - "rev": "c8ccc31f3ea29dc3eb5b54945e5eb549529491d6", + "rev": "66714e5ce44269ecc58c20d9196da8dbe1b27a31", "type": "github" }, "original": { @@ -577,11 +579,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777806186, - "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", + "lastModified": 1781968807, + "narHash": "sha256-yYO3Vw2M0y3TAUqt+9+Mj0zwP3XDTF5/PXcPhhFQ1ZM=", "owner": "tinted-theming", "repo": "schemes", - "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", + "rev": "2ccef2f4b22e3cab5a9292811f7133a07eeba4a7", "type": "github" }, "original": { @@ -593,11 +595,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1778379944, - "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", + "lastModified": 1782012462, + "narHash": "sha256-2iDiD8DQLwS1lGuD9TS8WlvNyDoTs6krWntJbtB2zGo=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", + "rev": "8c4e750f738a742bd73377ee41d3dadedebedef4", "type": "github" }, "original": { @@ -609,11 +611,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1778378178, - "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", + "lastModified": 1782009766, + "narHash": "sha256-VUhBjpGvWqHI7rWeyMYb/u87YJSXHKfVV6S+IelWeO8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "9cd816033ff969415b190722cddf134e78a5665f", + "rev": "5e8350bcd354e3241ab681a265fa6ef060c40be1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8b7226f..91868ca 100644 --- a/flake.nix +++ b/flake.nix @@ -45,6 +45,7 @@ ./easyroam.nix ./configuration.nix ./nixvim/nixvim.nix + ./hw-configs/laptop.nix nix-easyroam.nixosModules.nix-easyroam stylix.nixosModules.stylix nixvim.nixosModules.nixvim diff --git a/hw-configs/laptop.nix b/hw-configs/laptop.nix new file mode 100644 index 0000000..31e056d --- /dev/null +++ b/hw-configs/laptop.nix @@ -0,0 +1,33 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/751981d7-36b5-4759-b0eb-7db70b5d7b8c"; + fsType = "xfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/65BD-721E"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/889d88f6-0a64-482a-88e1-7a091a019373"; } + ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/stylix.nix b/stylix.nix index 879a77d..335295c 100644 --- a/stylix.nix +++ b/stylix.nix @@ -52,7 +52,8 @@ name = config.stylix.fonts.monospace.name; }; monospace = { - name = "Iosevka Custom"; + name = "Maple Mono"; + package = pkgs.maple-mono.truetype; }; emoji = { From ee492efb2aa4d699b6be9cdf09c62730495e39ae Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 25 Jul 2026 17:28:34 +0200 Subject: [PATCH 46/57] add pc config --- flake.nix | 1 + hw-configs/desktop.nix | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 hw-configs/desktop.nix diff --git a/flake.nix b/flake.nix index 91868ca..94f9c2e 100644 --- a/flake.nix +++ b/flake.nix @@ -82,6 +82,7 @@ modules = [ ./configuration.nix ./nixvim/nixvim.nix + ./hw-configs/desktop.nix lanzaboote.nixosModules.lanzaboote nix-easyroam.nixosModules.nix-easyroam stylix.nixosModules.stylix diff --git a/hw-configs/desktop.nix b/hw-configs/desktop.nix new file mode 100644 index 0000000..64df67f --- /dev/null +++ b/hw-configs/desktop.nix @@ -0,0 +1,31 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/64a37727-0c5f-41d4-afac-dc26978916c1"; + fsType = "xfs"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/F424-0E3E"; + fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} From b970a643286ebfd8ace3c4a8a436cec6d89dfc75 Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 26 Jul 2026 09:16:19 +0200 Subject: [PATCH 47/57] disable hdr --- home/hyprland.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/hyprland.lua b/home/hyprland.lua index 2c11d4d..d63a75b 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -10,16 +10,12 @@ hl.monitor({ mode = "preferred", position = "auto", scale = "1", - bitdepth = 10, - cm = "wide", }) hl.monitor({ output = "DP-5", mode = "2560x1440@165", position = "auto", scale = "1", - bitdepth = 10, - cm = "wide", }) -- Set programs that you use From 9d22e2eff07790f0abf5f601f4dd3eda21a3b522 Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 26 Jul 2026 15:16:04 +0200 Subject: [PATCH 48/57] add function to disable useless shit --- flake.nix | 1 + home/stylix.nix | 31 +++++++++++++++++++++++++++++++ stylix.nix | 28 +++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 94f9c2e..cc498ca 100644 --- a/flake.nix +++ b/flake.nix @@ -79,6 +79,7 @@ ]; }; nixosConfigurations.nerv = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; modules = [ ./configuration.nix ./nixvim/nixvim.nix diff --git a/home/stylix.nix b/home/stylix.nix index 68bfa4d..2969c65 100644 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -1,4 +1,35 @@ { + lib, + inputs, + ... +}: +let + keep = [ + "neovim" + "qt" + "gtk" + "hyprland" + "hyprpaper" + "foot" + "fuzzel" + "discord" + "console" + ]; + dir = "${inputs.stylix}/modules"; + + drop = builtins.filter (n: !(builtins.elem n keep)) ( + builtins.attrNames (lib.filterAttrs (_: t: t == "directory") (builtins.readDir dir)) + ); + + disable = + platform: + map (n: "${dir}/${n}/${platform}.nix") ( + builtins.filter (n: builtins.pathExists "${dir}/${n}/${platform}.nix") drop + ); +in + +{ + disabledModules = disable "hm"; stylix = { enable = true; autoEnable = false; diff --git a/stylix.nix b/stylix.nix index 335295c..568cbb4 100644 --- a/stylix.nix +++ b/stylix.nix @@ -1,10 +1,36 @@ { + inputs, config, pkgs, lib, ... }: +let + keep = [ + "neovim" + "qt" + "gtk" + "hyprland" + "foot" + "fuzzel" + "nixcord" + "console" + ]; + dir = "${inputs.stylix}/modules"; + + drop = builtins.filter (n: !(builtins.elem n keep)) ( + builtins.attrNames (lib.filterAttrs (_: t: t == "directory") (builtins.readDir dir)) + ); + + disable = + platform: + map (n: "${dir}/${n}/${platform}.nix") ( + builtins.filter (n: builtins.pathExists "${dir}/${n}/${platform}.nix") drop + ); +in { + disabledModules = disable "nixos"; + stylix.opacity = { terminal = 0.8; desktop = 1.0; @@ -24,7 +50,7 @@ stylix = { enable = true; autoEnable = false; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/oxocarbon-dark.yaml"; polarity = "dark"; image = ./wallpaper.png; targets = { From be60afd7149cf68fd9e5d04fe16937587bf5a05e Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 26 Jul 2026 15:22:17 +0200 Subject: [PATCH 49/57] swap to rose pine --- stylix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylix.nix b/stylix.nix index 568cbb4..e39b5fc 100644 --- a/stylix.nix +++ b/stylix.nix @@ -50,7 +50,7 @@ in stylix = { enable = true; autoEnable = false; - base16Scheme = "${pkgs.base16-schemes}/share/themes/oxocarbon-dark.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; polarity = "dark"; image = ./wallpaper.png; targets = { From 060b2c901556691477f87a44181a22126d3c69b7 Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 26 Jul 2026 15:26:12 +0200 Subject: [PATCH 50/57] remove shit from syncthing config --- home/home.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/home/home.nix b/home/home.nix index 40bd548..265f852 100644 --- a/home/home.nix +++ b/home/home.nix @@ -25,18 +25,7 @@ home.pointerCursor.enable = true; home.username = "lucy"; home.homeDirectory = "/home/lucy"; - services.syncthing = { - enable = true; - settings = { - devices = { - cyberia = { - id = "OOJBAJU-AAIKLHO-BKMMHBU-2NXE75Z-HE64A6V-LET4ZXB-Q2FT2Y4-GZON3AD"; - autoAcceptFolders = true; - name = "cyberia"; - }; - }; - }; - }; + services.syncthing.enable = true; programs.git = { enable = true; settings = { From 7abe721ab1528f120dfc3154741da4887564fba3 Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 26 Jul 2026 16:04:31 +0200 Subject: [PATCH 51/57] add spicetify --- configuration.nix | 2 +- flake.lock | 39 ++++++++++++++++++++++++++++++++++++++- flake.nix | 4 ++++ home/home.nix | 6 +++++- home/stylix.nix | 2 ++ 5 files changed, 50 insertions(+), 3 deletions(-) diff --git a/configuration.nix b/configuration.nix index 531818e..dca8029 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,5 +1,5 @@ { - config, + inputs, pkgs, ... }: diff --git a/flake.lock b/flake.lock index dcc6199..47a23b0 100644 --- a/flake.lock +++ b/flake.lock @@ -472,6 +472,7 @@ "nixcord": "nixcord", "nixpkgs": "nixpkgs", "nixvim": "nixvim", + "spicetify-nix": "spicetify-nix", "stylix": "stylix" } }, @@ -496,6 +497,27 @@ "type": "github" } }, + "spicetify-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1785048222, + "narHash": "sha256-LjFVfwxensz76SjnvofF1Jsw+xTLd8Qp31W0J6nh2XI=", + "owner": "Gerg-L", + "repo": "spicetify-nix", + "rev": "17e524f330c282d31c32dfe076222d4a12277886", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "spicetify-nix", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -509,7 +531,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_2", + "systems": "systems_3", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -560,6 +582,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-kitty": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index cc498ca..9a7db1f 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,10 @@ url = "github:nix-community/lanzaboote/v1.1.0"; inputs.nixpkgs.follows = "nixpkgs"; }; + spicetify-nix = { + url = "github:Gerg-L/spicetify-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/home/home.nix b/home/home.nix index 265f852..6fa1c50 100644 --- a/home/home.nix +++ b/home/home.nix @@ -10,12 +10,16 @@ ./fastfetch.nix ./hyprland.nix inputs.nixcord.homeModules.nixcord + inputs.spicetify-nix.homeManagerModules.spicetify ]; + programs.spicetify = { + enable = true; + wayland = true; + }; # Home Manager needs a bit of information about you and the # paths it should manage. home.packages = with pkgs; [ xournalpp - spotify fastfetch hyfetch nemo diff --git a/home/stylix.nix b/home/stylix.nix index 2969c65..8259677 100644 --- a/home/stylix.nix +++ b/home/stylix.nix @@ -5,6 +5,7 @@ }: let keep = [ + "spicetify" "neovim" "qt" "gtk" @@ -41,6 +42,7 @@ in hyprland.hyprpaper.enable = false; fuzzel.enable = true; foot.enable = true; + spicetify.enable = true; }; }; } From 1a9a6355b39361b70aa0fe2f909c8d4e7ce7358e Mon Sep 17 00:00:00 2001 From: lucy Date: Sun, 26 Jul 2026 16:30:20 +0200 Subject: [PATCH 52/57] disable hdr --- home/hyprland.lua | 4 ---- 1 file changed, 4 deletions(-) diff --git a/home/hyprland.lua b/home/hyprland.lua index 2c11d4d..d63a75b 100644 --- a/home/hyprland.lua +++ b/home/hyprland.lua @@ -10,16 +10,12 @@ hl.monitor({ mode = "preferred", position = "auto", scale = "1", - bitdepth = 10, - cm = "wide", }) hl.monitor({ output = "DP-5", mode = "2560x1440@165", position = "auto", scale = "1", - bitdepth = 10, - cm = "wide", }) -- Set programs that you use From 2eaff572eaeac6b7a23cd26691d9d7d1c611d547 Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 27 Jul 2026 22:53:42 +0200 Subject: [PATCH 53/57] switch to zsh --- configuration.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configuration.nix b/configuration.nix index dca8029..637c102 100644 --- a/configuration.nix +++ b/configuration.nix @@ -81,6 +81,14 @@ eval "$(devenv hook bash)" ''; }; + programs.zsh = { + enable = true; + enableCompletion = true; + autosuggestions.enable = true; + syntaxHighlighting.enable = true; + ohMyZsh.enable = true; + ohMyZsh.theme = "gentoo"; + }; # Enable CUPS to print documents. services.printing.enable = true; @@ -118,6 +126,7 @@ nerd-fonts.symbols-only ]; users.users."lucy" = { + shell = pkgs.zsh; isNormalUser = true; description = "lucy"; extraGroups = [ From 3b0744f17719ab6df3b0246edef8ef15f74e433d Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 27 Jul 2026 22:56:01 +0200 Subject: [PATCH 54/57] change nixvim keybind for toggleterm --- nixvim/keymaps.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixvim/keymaps.nix b/nixvim/keymaps.nix index 342a5da..f1f921d 100644 --- a/nixvim/keymaps.nix +++ b/nixvim/keymaps.nix @@ -6,7 +6,7 @@ action = " lua vim.lsp.buf.format() "; } { - key = "t"; + key = ""; action = "ToggleTerm size=10"; } { From 937581ffcb750fb3d138d8bea7a6cdfd84a59652 Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 27 Jul 2026 23:02:06 +0200 Subject: [PATCH 55/57] update flake lockfile --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 47a23b0..3d4e925 100644 --- a/flake.lock +++ b/flake.lock @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1784913159, - "narHash": "sha256-JWq0BfjO4ktpH5USfQNQzdvHpIDT8fSKD5K7LvdMRFs=", + "lastModified": 1785168662, + "narHash": "sha256-kGJTc0oEUQuEwV66lSlMxYtOEtpk9N/HS43k+rFAvs8=", "owner": "nix-community", "repo": "home-manager", - "rev": "079a3b5d1aa6a719920a51316253b7d6dd22738d", + "rev": "cbb77679b3d992c8b62f884cd3a84af534a28621", "type": "github" }, "original": { @@ -320,11 +320,11 @@ "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { - "lastModified": 1784915044, - "narHash": "sha256-i/1GB/YbjXWYbSdh+nh/wCvvCU78mMkfuPmCNRAbJZE=", + "lastModified": 1785174508, + "narHash": "sha256-lnLPM02rSg8LxRwbNh0vfkB4OsBE5FYnVhy3dz2CPjI=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "f8de57863e0a4aad7e64c1ad00d56d5f925b9bf1", + "rev": "3708bb6f9e6c0e65b10741eab6ac55e701c09625", "type": "github" }, "original": { @@ -335,11 +335,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1784783405, - "narHash": "sha256-4IHyyLgLBdKefkljdKod4IMn023pQiDXAWJA187cmdY=", + "lastModified": 1785141334, + "narHash": "sha256-kh35kIx7el4Jk8Ki3BH9/Pn1eZYSYLJ6LMALos0zOy0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7525d999cd850b9a488817abc89c75dc733acf17", + "rev": "38a4887411571457d700c51c64a6e49ead2ed5ab", "type": "github" }, "original": { @@ -403,11 +403,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1784814601, - "narHash": "sha256-T32JXjZ7kIbhBn8/Har171yGg6IBdl97cxAWameqZDE=", + "lastModified": 1785001306, + "narHash": "sha256-xWqmquUtqKXLeDZ1oQUO+rV4sjA9TShIJhLL8M5Bozo=", "owner": "nix-community", "repo": "nixvim", - "rev": "f316e949e0ed9df0e1e0bf645c6dce721d4e230e", + "rev": "48409beb41e8e28b64e8160ca82d8a93fb628963", "type": "github" }, "original": { From abfe4bdc54c74ab51522806a6a86e59b396ae4d8 Mon Sep 17 00:00:00 2001 From: lucy Date: Mon, 27 Jul 2026 23:06:34 +0200 Subject: [PATCH 56/57] add devenv hook to zsh and remove bash from configuration.nix --- configuration.nix | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/configuration.nix b/configuration.nix index 637c102..8e1266e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -68,19 +68,6 @@ } ]; - programs.bash = { - completion.enable = true; - shellAliases = { - "rebuild" = "doas nixos-rebuild switch --flake $HOME/nixos/ --impure"; - }; - promptInit = '' - PS1='\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] ' - ''; - interactiveShellInit = '' - complete -F _command doas - eval "$(devenv hook bash)" - ''; - }; programs.zsh = { enable = true; enableCompletion = true; @@ -88,6 +75,7 @@ syntaxHighlighting.enable = true; ohMyZsh.enable = true; ohMyZsh.theme = "gentoo"; + interactiveShellInit = ''eval "$(devenv hook zsh)"''; }; # Enable CUPS to print documents. services.printing.enable = true; From dfa5f7c65c8b9b094278ffbc893a2f02469fb465 Mon Sep 17 00:00:00 2001 From: lucy Date: Wed, 29 Jul 2026 20:43:30 +0200 Subject: [PATCH 57/57] use gruber theme --- nixvim/nixvim.nix | 1 + stylix.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixvim/nixvim.nix b/nixvim/nixvim.nix index 8fd62cc..4d5ea02 100644 --- a/nixvim/nixvim.nix +++ b/nixvim/nixvim.nix @@ -21,6 +21,7 @@ ''; opts = { relativenumber = true; + number = true; tabstop = 8; shiftwidth = 8; expandtab = true; diff --git a/stylix.nix b/stylix.nix index e39b5fc..7e498d7 100644 --- a/stylix.nix +++ b/stylix.nix @@ -50,7 +50,7 @@ in stylix = { enable = true; autoEnable = false; - base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruber.yaml"; polarity = "dark"; image = ./wallpaper.png; targets = {