From 3015395f82d45ef4aaf3e7404cb3577ed76425aa Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Wed, 7 Aug 2024 23:31:14 +0200 Subject: [PATCH] cleanup, switch to nix-super --- flake.lock | 324 +++++++++++------------- hosts/default.nix | 2 - hosts/vali/temperance/configuration.nix | 3 - modules/cli/zellij.nix | 2 +- modules/gui/default.nix | 3 - modules/gui/minecraft.nix | 1 - modules/runners/anyrun/anyrun.nix | 27 +- modules/runners/anyrun/style.css | 2 +- modules/system/nix/module.nix | 9 +- modules/system/nix/nixpkgs.nix | 4 +- modules/wms/wayland/hypr/land.nix | 18 +- 11 files changed, 169 insertions(+), 226 deletions(-) diff --git a/flake.lock b/flake.lock index 3a449c6..99209ef 100644 --- a/flake.lock +++ b/flake.lock @@ -333,11 +333,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -347,22 +347,6 @@ } }, "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "locked": { "lastModified": 1717312683, "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", @@ -377,7 +361,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -393,7 +377,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1673956053, @@ -469,29 +453,7 @@ "flake-parts_4": { "inputs": { "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "hercules-ci-effects", + "nix-super", "nixpkgs" ] }, @@ -504,11 +466,12 @@ "type": "github" }, "original": { - "id": "flake-parts", - "type": "indirect" + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": [ "nixpak", @@ -529,7 +492,7 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_6": { "inputs": { "nixpkgs-lib": [ "nixpkgs-wayland", @@ -551,7 +514,7 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "schizofox", @@ -572,7 +535,7 @@ "type": "github" } }, - "flake-parts_9": { + "flake-parts_8": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_4" }, @@ -678,6 +641,21 @@ } }, "flake-utils_6": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { "inputs": { "systems": "systems_10" }, @@ -695,7 +673,7 @@ "type": "github" } }, - "flake-utils_7": { + "flake-utils_8": { "inputs": { "systems": "systems_12" }, @@ -744,55 +722,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_3", - "gitignore": "gitignore", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ], - "nixpkgs-stable": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722857853, - "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "neovim-nightly-overlay", - "git-hooks", - "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": { @@ -832,28 +761,6 @@ } }, "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719226092, - "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, - "hercules-ci-effects_2": { "inputs": { "flake-parts": [ "nixpak", @@ -1155,7 +1062,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_7", "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { @@ -1172,6 +1079,22 @@ "type": "github" } }, + "libgit2": { + "flake": false, + "locked": { + "lastModified": 1697646580, + "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", + "type": "github" + }, + "original": { + "owner": "libgit2", + "repo": "libgit2", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -1371,45 +1294,6 @@ "type": "github" } }, - "neovim-nightly-overlay": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts_4", - "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", - "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1723009317, - "narHash": "sha256-JHLnOp4ShzadTVKwqQoR0sWLBdL34NZxSj74P9/kw/I=", - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "rev": "fbe4e6c5f5cbcb9264f0dfea8d341db17fd1dda0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "neovim-nightly-overlay", - "type": "github" - } - }, - "neovim-src": { - "flake": false, - "locked": { - "lastModified": 1722987267, - "narHash": "sha256-Zxy5ceQlD26Vi6lVbKAjs+B5ENghuLu2ktSGKH5VcIU=", - "owner": "neovim", - "repo": "neovim", - "rev": "0c99ce0e89515de218f2b4e5f270885045868e93", - "type": "github" - }, - "original": { - "owner": "neovim", - "repo": "neovim", - "type": "github" - } - }, "nil": { "inputs": { "flake-utils": [ @@ -1438,7 +1322,7 @@ }, "nix-eval-jobs": { "inputs": { - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_6", "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_10", "treefmt-nix": "treefmt-nix" @@ -1494,6 +1378,30 @@ "type": "github" } }, + "nix-super": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_4", + "libgit2": "libgit2", + "nixpkgs": "nixpkgs_8", + "nixpkgs-23-11": "nixpkgs-23-11", + "nixpkgs-regression": "nixpkgs-regression", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1721740036, + "narHash": "sha256-9NX7GJ04dP5jZf5Zk5n1b68yBMx/bibqeZ7X+gkAgTU=", + "owner": "privatevoid-net", + "repo": "nix-super", + "rev": "fbe214b76e4caae52c33d06d20dbc09053925274", + "type": "github" + }, + "original": { + "owner": "privatevoid-net", + "repo": "nix-super", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1722332872, @@ -1512,8 +1420,8 @@ }, "nixpak": { "inputs": { - "flake-parts": "flake-parts_6", - "hercules-ci-effects": "hercules-ci-effects_2", + "flake-parts": "flake-parts_5", + "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": [ "nixpkgs" ] @@ -1548,6 +1456,22 @@ "type": "github" } }, + "nixpkgs-23-11": { + "locked": { + "lastModified": 1717159533, + "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "lastModified": 1722555339, @@ -1605,6 +1529,22 @@ "type": "github" } }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1722869614, @@ -1623,7 +1563,7 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", "nixpkgs": "nixpkgs_11" @@ -1820,16 +1760,16 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1722957468, - "narHash": "sha256-SQ0TCC4aklOhN/OzcztrKqDLY8SjpIZcyvTulzhDXs0=", + "lastModified": 1723062461, + "narHash": "sha256-CmOcGVVyf6tOoqJVyTdxq1GwOtPF2xL98VFJa/gbEWQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2a13929e1f191b3690dd2f2db13098b04adb9043", + "rev": "0ec40869d52f68a5a27017a3a62a01a8965a3038", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } @@ -3451,6 +3391,38 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "nix-super" + ], + "flake-utils": "flake-utils_6", + "gitignore": [ + "nix-super" + ], + "nixpkgs": [ + "nix-super", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nix-super", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712897695, + "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "quickshell": { "inputs": { "nixpkgs": [ @@ -3505,7 +3477,7 @@ "hyprland-plugins": "hyprland-plugins", "lix-module": "lix-module", "neovim-flake": "neovim-flake", - "neovim-nightly-overlay": "neovim-nightly-overlay", + "nix-super": "nix-super", "nixos-hardware": "nixos-hardware", "nixpak": "nixpak", "nixpkgs": "nixpkgs_9", @@ -3572,8 +3544,8 @@ }, "schizofox": { "inputs": { - "flake-compat": "flake-compat_5", - "flake-parts": "flake-parts_8", + "flake-compat": "flake-compat_4", + "flake-parts": "flake-parts_7", "home-manager": "home-manager_3", "nixpak": [ "nixpak" @@ -3601,7 +3573,7 @@ "searx-randomizer": { "inputs": { "crane": "crane_2", - "flake-parts": "flake-parts_9", + "flake-parts": "flake-parts_8", "nixpkgs": [ "schizofox", "nixpkgs" @@ -3623,7 +3595,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_8", "nixpkgs": "nixpkgs_12" }, "locked": { @@ -3670,7 +3642,7 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "gnome-shell": "gnome-shell", "home-manager": "home-manager_4", "nixpkgs": "nixpkgs_13" diff --git a/hosts/default.nix b/hosts/default.nix index dc7cd53..fc0c12d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -38,7 +38,6 @@ in { ./vali/temperance ../modules inputs.home-manager.nixosModules.home-manager - inputs.lix-module.nixosModules.default ]; }; @@ -49,7 +48,6 @@ in { ./vali/hermit ../modules inputs.home-manager.nixosModules.home-manager - inputs.lix-module.nixosModules.default inputs.nixos-hardware.nixosModules.dell-xps-15-7590-nvidia ]; }; diff --git a/hosts/vali/temperance/configuration.nix b/hosts/vali/temperance/configuration.nix index 5967a6e..db001b6 100644 --- a/hosts/vali/temperance/configuration.nix +++ b/hosts/vali/temperance/configuration.nix @@ -3,8 +3,6 @@ config, ... }: { - # allow unfree packages - nixpkgs.config.allowUnfree = true; # Time Zone time.timeZone = "Europe/Zurich"; # Select internationalisation properties. @@ -38,7 +36,6 @@ discord.enable = true; firefox.enable = true; # spotify.enable = true; - zathura.enable = true; zellij.enable = true; terminals = { foot.enable = true; diff --git a/modules/cli/zellij.nix b/modules/cli/zellij.nix index 673e095..a43a555 100644 --- a/modules/cli/zellij.nix +++ b/modules/cli/zellij.nix @@ -11,7 +11,7 @@ in { home-manager.users.${username} = { programs.zellij = { enable = true; - enableFishIntegration = false; + enableFishIntegration = true; on_force_close = "quit"; layout_dir = "${./layouts}"; settings = { diff --git a/modules/gui/default.nix b/modules/gui/default.nix index 936dbfb..c888fcb 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -4,16 +4,13 @@ _: { ./gtk.nix ./foot.nix ./mpv.nix - # ./kakoune ./qt.nix ./zathura.nix ./spicetify.nix ./kitty.nix - #./vivado.nix ./steam.nix ./waybar.nix ./schizofox ./minecraft.nix - # ./emacs ]; } diff --git a/modules/gui/minecraft.nix b/modules/gui/minecraft.nix index 7d21247..9910fcb 100644 --- a/modules/gui/minecraft.nix +++ b/modules/gui/minecraft.nix @@ -1,7 +1,6 @@ { config, lib, - inputs, pkgs, ... }: diff --git a/modules/runners/anyrun/anyrun.nix b/modules/runners/anyrun/anyrun.nix index 9fed020..e620aaf 100644 --- a/modules/runners/anyrun/anyrun.nix +++ b/modules/runners/anyrun/anyrun.nix @@ -19,10 +19,7 @@ in { plugins = with inputs'.anyrun.packages; [ applications dictionary - #rink shell - # symbols - #translate websearch ]; hideIcons = false; @@ -45,6 +42,7 @@ in { desktop_actions: false ) ''; + "websearch.ron".text = '' Config( prefix: "?", @@ -52,29 +50,6 @@ in { ) ''; - "symbols.ron".text = '' - Config( - // The prefix that the search needs to begin with to yield symbol results - prefix: ":sy", - - // Custom user defined symbols to be included along the unicode symbols - symbols: { - // "name": "text to be copied" - "shrug": "¯\\_(ツ)_/¯", - }, - - // The number of entries to be displayed - max_entries: 5, - ) - ''; - - "translate.ron".text = '' - Config( - prefix: ":tr", - language_delimiter: ">", - max_entries: 3, - ) - ''; }; }; }; diff --git a/modules/runners/anyrun/style.css b/modules/runners/anyrun/style.css index 32971ab..5f6dae8 100644 --- a/modules/runners/anyrun/style.css +++ b/modules/runners/anyrun/style.css @@ -1,7 +1,7 @@ * { all: unset; font-size: 1.3rem; - font-family: "JetBrains Mono" + font-family: "ComicShannsMono Nerd Font" } #window, diff --git a/modules/system/nix/module.nix b/modules/system/nix/module.nix index 854af6b..bb55a65 100644 --- a/modules/system/nix/module.nix +++ b/modules/system/nix/module.nix @@ -1,12 +1,15 @@ -{pkgs, ...}: { +{ + pkgs, + inputs', + ... +}: { imports = [ ./documentation.nix # nixos documentation # ./nixpkgs.nix # global nixpkgs configuration.nix ]; nix = { - # Lix, Nix but gay! - package = pkgs.lix; + package = inputs'.nix-super.packages.default; # Run the Nix daemon on lowest possible priority so that my system # stays responsive during demanding tasks such as GC and builds. diff --git a/modules/system/nix/nixpkgs.nix b/modules/system/nix/nixpkgs.nix index ecd16ea..e41e79c 100644 --- a/modules/system/nix/nixpkgs.nix +++ b/modules/system/nix/nixpkgs.nix @@ -14,9 +14,7 @@ allowBroken = false; allowUnsupportedSystem = true; - # Really a pain in the ass to deal with when disabled. True means - # we are able to build unfree packages without explicitly allowing - # each unfree package. + # Allow unfree packages since it's sadly necessary allowUnfree = true; # Default to none, add more as necessary. This is usually where diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix index be90d75..5b7e725 100644 --- a/modules/wms/wayland/hypr/land.nix +++ b/modules/wms/wayland/hypr/land.nix @@ -18,8 +18,9 @@ (inputs'.split-monitor-workspaces.packages) split-monitor-workspaces ; + inherit (lib) mkIf; in { - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { # programs.hyprland = { # enable = true; # inherit (cfg) package; @@ -127,8 +128,6 @@ in { kb_layout = "de"; kb_variant = ""; kb_model = ""; - # kb_options = "grp:alt_shift_toggle,misc:extend,lv5:caps_switch_lock,compose:menu"; - # kb_rules = ",evdev"; follow_mouse = true; @@ -139,6 +138,7 @@ in { disable_while_typing = true; }; }; + general = { sensitivity = 1.0; gaps_in = 0; @@ -147,6 +147,7 @@ in { no_border_on_floating = true; }; + #Decoration settings decoration = { rounding = 0; @@ -166,8 +167,6 @@ in { # Generate your own at https://www.cssportal.com/css-cubic-bezier-generator/ bezier = [ "dupa, 0.1, 0.9, 0.1, 1.05" - "apf,0.76,0,0.24,1" - "fast,0.34,1.56,0.64,1" ]; # Hyprland anomations, using the above bezier curves animations = { @@ -180,12 +179,14 @@ in { "workspaces, 1, 5, dupa, slidevert" ]; }; + dwindle = {no_gaps_when_only = true;}; cursor = { hide_on_key_press = true; no_hardware_cursors = true; }; + misc = { enable_swallow = true; swallow_regex = "foot"; @@ -196,6 +197,7 @@ in { animate_mouse_windowdragging = false; force_default_wallpaper = 0; }; + # Window rules for some programs. windowrulev2 = [ "float, class:^(Tor Browser)$" @@ -210,6 +212,7 @@ in { "center, class: ^(code), title: ^(Open*)" "float, class:^(org.keepassxc.KeePassXC)$" ]; + # Keybinds bind = [ "$mainMod, RETURN, exec, ${foot}/bin/foot" @@ -351,9 +354,10 @@ in { "${pkgs.procps}/bin/pkill helvum" # and run it all again - "[workspace special:pipewire silent;tile] ${pkgs.helvum}/bin/helvum" - "[workspace special:pipewire;silent;tile] ${pkgs.pavucontrol}/bin/pavucontrol" + "[workspace special:pipewire; silent;tile] ${pkgs.helvum}/bin/helvum" + "[workspace special:pipewire; silent;tile] ${pkgs.pavucontrol}/bin/pavucontrol" ]; + plugin = { split-monitor-workspaces = { keep-focued = true;