From 1a4ef774e40e2015120ed36222080b8ae61bb9d1 Mon Sep 17 00:00:00 2001 From: Lucy von Overheidt Date: Tue, 9 Sep 2025 23:49:00 +0200 Subject: [PATCH] meow --- configuration.nix | 4 +-- flake.lock | 65 --------------------------------------- flake.nix | 50 ++++++++++-------------------- modules/firefox-nixos.nix | 2 -- modules/firefox.nix | 2 +- modules/fonts.nix | 11 ------- modules/home.nix | 1 - modules/hyfetch.nix | 2 +- modules/niri/binds.nix | 1 - modules/niri/default.nix | 2 +- modules/niri/settings.nix | 14 +++------ modules/ssh.nix | 5 +-- modules/wallpaper.nix | 7 +---- 13 files changed, 26 insertions(+), 140 deletions(-) diff --git a/configuration.nix b/configuration.nix index 4418bda..b279c19 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,9 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page, on # https://search.nixos.org/options and in the NixOS manual (`nixos-help`). -{ config -, lib -, pkgs +{ pkgs , ... }: diff --git a/flake.lock b/flake.lock index 8158b78..2e5a48b 100644 --- a/flake.lock +++ b/flake.lock @@ -167,28 +167,6 @@ "url": "https://install.determinate.systems/determinate-nixd/tag/v3.11.1/x86_64-linux" } }, - "firefox-addons": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "dir": "pkgs/firefox-addons", - "lastModified": 1757410664, - "narHash": "sha256-MVjY6naARVAOIcNCDPUeNqqw1ttIuaDxBhE5c+i21nI=", - "owner": "rycee", - "repo": "nur-expressions", - "rev": "59d32d171d43bbe5ba9f3cb4723066f91595786f", - "type": "gitlab" - }, - "original": { - "dir": "pkgs/firefox-addons", - "owner": "rycee", - "repo": "nur-expressions", - "type": "gitlab" - } - }, "firefox-gnome-theme": { "flake": false, "locked": { @@ -455,26 +433,6 @@ "url": "https://flakehub.com/f/DeterminateSystems/nix-src/%2A" } }, - "nix-index-db": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1757218147, - "narHash": "sha256-IwOwN70HvoBNB2ckaROxcaCvj5NudNc52taPsv5wtLk=", - "owner": "Mic92", - "repo": "nix-index-database", - "rev": "9b144dc3ef6e42b888c4190e02746aab13b0e97f", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-index-database", - "type": "github" - } - }, "nix-mineral": { "flake": false, "locked": { @@ -694,40 +652,17 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1756981260, - "narHash": "sha256-GhuD9QVimjynHI0OOyZsqJsnlXr2orowh9H+HYz4YMs=", - "ref": "refs/heads/master", - "rev": "6eb12551baf924f8fdecdd04113863a754259c34", - "revCount": 672, - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/quickshell/quickshell" - } - }, "root": { "inputs": { "c3d2-user-module": "c3d2-user-module", "comin": "comin", "determinate": "determinate", - "firefox-addons": "firefox-addons", "home-manager": "home-manager", "musnix": "musnix", "niri": "niri", - "nix-index-db": "nix-index-db", "nix-mineral": "nix-mineral", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", - "quickshell": "quickshell", "stylix": "stylix", "treefmt-nix": "treefmt-nix" } diff --git a/flake.nix b/flake.nix index 2ac2e10..37041a1 100644 --- a/flake.nix +++ b/flake.nix @@ -15,14 +15,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*"; - nix-index-db = { - url = "github:Mic92/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - quickshell = { - url = "git+https://git.outfoxxed.me/quickshell/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; comin = { url = "github:nlewo/comin"; inputs.nixpkgs.follows = "nixpkgs"; @@ -31,10 +23,6 @@ url = "github:nix-community/stylix"; inputs.nixpkgs.follows = "nixpkgs"; }; - firefox-addons = { - url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; - inputs.nixpkgs.follows = "nixpkgs"; - }; musnix.url = "github:musnix/musnix"; nix-mineral = { url = "github:cynicsketch/nix-mineral"; @@ -43,22 +31,19 @@ }; outputs = - inputs@{ - self, - nixpkgs, - c3d2-user-module, - home-manager, - niri, - nixos-hardware, - treefmt-nix, - determinate, - nix-index-db, - quickshell, - stylix, - comin, - firefox-addons, - musnix, - nix-mineral, + inputs@{ self + , nixpkgs + , c3d2-user-module + , home-manager + , niri + , nixos-hardware + , treefmt-nix + , determinate + , stylix + , comin + , musnix + , nix-mineral + , }: let system = "x86_64-linux"; @@ -187,12 +172,9 @@ home-manager.backupFileExtension = "backup"; home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.users.lucy = - { - config, - pkgs, - lib, - inputs, - ... + { pkgs + , inputs + , ... }: { imports = [ diff --git a/modules/firefox-nixos.nix b/modules/firefox-nixos.nix index 7338d72..dca6a2f 100644 --- a/modules/firefox-nixos.nix +++ b/modules/firefox-nixos.nix @@ -1,6 +1,4 @@ { ... }: -let -in { programs.firefox = { policies.ExtensionSettings = { diff --git a/modules/firefox.nix b/modules/firefox.nix index 54a0a46..d53f931 100644 --- a/modules/firefox.nix +++ b/modules/firefox.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ ... }: { programs.firefox = { diff --git a/modules/fonts.nix b/modules/fonts.nix index 19fb4d6..870bb4c 100644 --- a/modules/fonts.nix +++ b/modules/fonts.nix @@ -1,15 +1,4 @@ { pkgs, ... }: -let - # Fetch the JSON file and read its content - fontsJson = builtins.fetchurl { - url = "https://raw.githubusercontent.com/NixOS/nixpkgs/nixos-unstable/pkgs/data/fonts/nerd-fonts/manifests/fonts.json"; - sha256 = "1kdmk4ayckixxckxbik9jg4fdqqgm7s5x1lvzd95v1g09bhn33wg"; - }; - - # Parse the JSON and extract package names - fonts = builtins.fromJSON (builtins.readFile fontsJson); - packageNames = map (font: font.package) fonts; -in { fonts.packages = with pkgs; [ iosevka diff --git a/modules/home.nix b/modules/home.nix index 0243033..b067021 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -1,6 +1,5 @@ { config , pkgs -, inputs , ... }: { diff --git a/modules/hyfetch.nix b/modules/hyfetch.nix index 28dc4e9..2ef09bd 100644 --- a/modules/hyfetch.nix +++ b/modules/hyfetch.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ ... }: { programs.hyfetch = { enable = true; diff --git a/modules/niri/binds.nix b/modules/niri/binds.nix index be3c5a1..922a7d8 100644 --- a/modules/niri/binds.nix +++ b/modules/niri/binds.nix @@ -10,7 +10,6 @@ let close-window maximize-column screenshot-window - screenshot focus-column-left focus-column-right focus-workspace-up diff --git a/modules/niri/default.nix b/modules/niri/default.nix index 9687634..d01b7d0 100644 --- a/modules/niri/default.nix +++ b/modules/niri/default.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, ... }: +{ ... }: { imports = [ ./settings.nix diff --git a/modules/niri/settings.nix b/modules/niri/settings.nix index deed6c6..9feb7db 100644 --- a/modules/niri/settings.nix +++ b/modules/niri/settings.nix @@ -1,9 +1,7 @@ -{ - config, - lib, - pkgs, - inputs, - ... +{ lib +, pkgs +, inputs +, ... }: let makeCommand = command: { @@ -12,10 +10,6 @@ let qs = "${pkgs.quickshell}/bin/qs"; wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste"; wallpapers = inputs.self.packages.${pkgs.system}.wallpapers; - helloKittyCursor = pkgs.fetchzip { - url = "https://www.rw-designer.com/cursor-downloadset/hello-kitty.zip"; - hash = ""; - }; in { diff --git a/modules/ssh.nix b/modules/ssh.nix index d46c66f..4b6b458 100644 --- a/modules/ssh.nix +++ b/modules/ssh.nix @@ -1,7 +1,4 @@ -{ config -, pkgs -, lib -, ... +{ ... }: let diff --git a/modules/wallpaper.nix b/modules/wallpaper.nix index ac541b5..dbc0594 100644 --- a/modules/wallpaper.nix +++ b/modules/wallpaper.nix @@ -1,13 +1,8 @@ -{ config -, pkgs -, lib +{ pkgs , inputs , ... }: -let - wallpapers = inputs.self.packages.${pkgs.system}.wallpapers; -in { programs.mpvpaper = { enable = true;