From 6c0eb5a13151bc420a53d34f71a143fc8e13df04 Mon Sep 17 00:00:00 2001 From: alyx Date: Sat, 21 Feb 2026 11:52:06 +0000 Subject: [PATCH] mostly usable flake --- flake.lock | 71 ++++++++++++++++++++++++++++++++++++++++++++++- flake.nix | 1 + home/default.nix | 11 ++++---- hosts/generic.nix | 1 + 4 files changed, 78 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a5ea4e1..60f742a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "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" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -36,10 +54,61 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "waterfox": "waterfox" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "waterfox": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1770890709, + "narHash": "sha256-OHwMl+tpRqOneH7QNrSYoPDqKYZahGZLd9Qkm067XoY=", + "owner": "Hythera", + "repo": "nix-waterfox", + "rev": "c1baa88fd80fc83105f2b5652d24bcc5d27caebc", + "type": "github" + }, + "original": { + "owner": "Hythera", + "repo": "nix-waterfox", + "type": "github" } } }, diff --git a/flake.nix b/flake.nix index 10b2b59..46734e1 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + waterfox.url = "github:Hythera/nix-waterfox"; }; outputs = inputs@{self, nixpkgs, home-manager, ...}:{ diff --git a/home/default.nix b/home/default.nix index dfbe29a..4bdeae9 100644 --- a/home/default.nix +++ b/home/default.nix @@ -12,7 +12,6 @@ ".config/waybar/config".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/cyberhack" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/modern"); ".config/waybar/style.css".source = (if vars.user == "alyx" then config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/cyberhack.css" else config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.config/nixos/home/waybar/modern.css"); }; - pointerCursor = { gtk.enable = true; x11.enable = true; @@ -20,7 +19,9 @@ name = "catppuccin-mocha-mauve-cursors"; size = 24; }; - gtk = { + }; + + gtk = { enable = true; theme = { name = "CyberHack"; @@ -30,15 +31,14 @@ qt = { enable = true; style.name = "kvantum"; - platformTheme = "qt5ct"; + platformTheme.name = "qtct"; }; dconf.settings = { "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; }; }; - }; - + programs.home-manager.enable = true; programs.foot = { enable = true; @@ -135,6 +135,7 @@ wlr-randr wttrbar v4l-utils + inputs.waterfox.packages.${pkgs.stdenv.hostPlatform.system}.waterfox-bin ]; } diff --git a/hosts/generic.nix b/hosts/generic.nix index 182296d..760a9b2 100644 --- a/hosts/generic.nix +++ b/hosts/generic.nix @@ -135,6 +135,7 @@ fonts.packages = with pkgs; [ jetbrains-mono nerd-fonts.iosevka + nerd-fonts.departure-mono noto-fonts noto-fonts-cjk-sans noto-fonts-color-emoji