From ab8461fd06baae1a2fa02896a26a07c60d83a2fa Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Mon, 11 Nov 2024 00:48:02 +0000 Subject: [PATCH] meta: unarchiving repository false alarm. i don't think my brother will particularly care about his SSD getting taken over by me, as he hasn't cared in the past... hopefully it's the same this time. --- computers/default.nix | 2 +- computers/python/configs/default.nix | 10 ++++++++ .../configs/foot/foot.ini | 0 .../configs/fuzzel/fuzzel.ini | 0 .../configs/kanshi/config | 0 .../python/configs/qutebrowser/config.py | 5 ++++ .../{waddledee => python}/configs/river/init | 0 computers/{waddledee => python}/default.nix | 23 +++++++++++-------- computers/{waddledee => python}/disks.nix | 0 .../hardware-configuration.nix | 0 computers/{waddledee => python}/river.nix | 17 +++----------- computers/{waddledee => python}/theme.nix | 0 flake.lock | 17 ++++++++++++++ flake.nix | 7 ++++++ overlays/default.nix | 10 ++------ overlays/derivations/fairfax.nix | 4 ++-- 16 files changed, 60 insertions(+), 35 deletions(-) create mode 100644 computers/python/configs/default.nix rename computers/{waddledee => python}/configs/foot/foot.ini (100%) rename computers/{waddledee => python}/configs/fuzzel/fuzzel.ini (100%) rename computers/{waddledee => python}/configs/kanshi/config (100%) create mode 100644 computers/python/configs/qutebrowser/config.py rename computers/{waddledee => python}/configs/river/init (100%) rename computers/{waddledee => python}/default.nix (73%) rename computers/{waddledee => python}/disks.nix (100%) rename computers/{waddledee => python}/hardware-configuration.nix (100%) rename computers/{waddledee => python}/river.nix (58%) rename computers/{waddledee => python}/theme.nix (100%) diff --git a/computers/default.nix b/computers/default.nix index 0829d28..ddbbb36 100644 --- a/computers/default.nix +++ b/computers/default.nix @@ -5,7 +5,7 @@ }: { flake = { nixosConfigurations = lib.mkComputers { - waddledee = { + python = { system = "x86_64-linux"; user = "artur"; extraModules = [ diff --git a/computers/python/configs/default.nix b/computers/python/configs/default.nix new file mode 100644 index 0000000..345a96c --- /dev/null +++ b/computers/python/configs/default.nix @@ -0,0 +1,10 @@ +{inputs, ...}: { + systemd.user.tmpfiles.users.artur.rules = (hcfg: [ + "L+ ${hcfg}/qutebrowser/config.py - - - - ${./qutebrowser/config.py}" + "L+ ${hcfg}/qutebrowser/rosepine - - - - ${inputs.rosepine-qutebrowser}" + "L+ ${hcfg}/kanshi/ - - - - ${./kanshi}" + "L+ ${hcfg}/fuzzel/ - - - - ${./fuzzel}" + "L+ ${hcfg}/river/ - - - - ${./river}" + "L+ ${hcfg}/foot/ - - - - ${./foot}" + ]) "%h/.config"; +} diff --git a/computers/waddledee/configs/foot/foot.ini b/computers/python/configs/foot/foot.ini similarity index 100% rename from computers/waddledee/configs/foot/foot.ini rename to computers/python/configs/foot/foot.ini diff --git a/computers/waddledee/configs/fuzzel/fuzzel.ini b/computers/python/configs/fuzzel/fuzzel.ini similarity index 100% rename from computers/waddledee/configs/fuzzel/fuzzel.ini rename to computers/python/configs/fuzzel/fuzzel.ini diff --git a/computers/waddledee/configs/kanshi/config b/computers/python/configs/kanshi/config similarity index 100% rename from computers/waddledee/configs/kanshi/config rename to computers/python/configs/kanshi/config diff --git a/computers/python/configs/qutebrowser/config.py b/computers/python/configs/qutebrowser/config.py new file mode 100644 index 0000000..69c1372 --- /dev/null +++ b/computers/python/configs/qutebrowser/config.py @@ -0,0 +1,5 @@ +import rosepine + +config.load_autoconfig() + +rosepine.setup(c, 'rose-pine', True) diff --git a/computers/waddledee/configs/river/init b/computers/python/configs/river/init similarity index 100% rename from computers/waddledee/configs/river/init rename to computers/python/configs/river/init diff --git a/computers/waddledee/default.nix b/computers/python/default.nix similarity index 73% rename from computers/waddledee/default.nix rename to computers/python/default.nix index 3a16a2a..5fd47e4 100644 --- a/computers/waddledee/default.nix +++ b/computers/python/default.nix @@ -4,6 +4,7 @@ ./disks.nix ./river.nix ./theme.nix + ./configs ]; config = { @@ -61,17 +62,19 @@ fonts = { names = { - sansSerif = ["Fira Sans"]; - monospace = ["Fira Mono"]; - serif = ["Poly"]; + sansSerif = ["Iosevka Comfy Wide Fixed"]; + monospace = ["Iosevka Comfy Wide Fixed"]; + serif = ["Iosevka Comfy Wide Motion Fixed"]; }; - packages = [ - (pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) - pkgs.font-awesome - pkgs.fira - pkgs.poly - ]; + packages = builtins.attrValues { + nerdfonts = pkgs.nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}; + inherit (pkgs) font-awesome; + inherit (pkgs.iosevka-comfy) + comfy-wide-motion-fixed + comfy-wide-fixed + ; + }; enable = true; }; @@ -87,7 +90,7 @@ networking.networkmanager.enable = true; time.timeZone = "Europe/London"; - i18n.defaultLocale = "en_GB.UTF-8"; + i18n.defaultLocale = "nl_NL.UTF-8"; system.stateVersion = "24.11"; }; } diff --git a/computers/waddledee/disks.nix b/computers/python/disks.nix similarity index 100% rename from computers/waddledee/disks.nix rename to computers/python/disks.nix diff --git a/computers/waddledee/hardware-configuration.nix b/computers/python/hardware-configuration.nix similarity index 100% rename from computers/waddledee/hardware-configuration.nix rename to computers/python/hardware-configuration.nix diff --git a/computers/waddledee/river.nix b/computers/python/river.nix similarity index 58% rename from computers/waddledee/river.nix rename to computers/python/river.nix index e04d974..d021670 100644 --- a/computers/waddledee/river.nix +++ b/computers/python/river.nix @@ -1,7 +1,6 @@ { inputs, pkgs, - config, ... }: { config = { @@ -41,18 +40,8 @@ QT_QPA_PLATFORM = "wayland"; }; - systemd = { - tmpfiles.rules = [ - "L+ /tmp/wallpapers/ - - - - ${inputs.wallpkgs.packages.${pkgs.system}.rose_pine}/share/wallpapers" - ]; - user.tmpfiles.users.artur.rules = let - hcfg = "%h/.config"; - in [ - "L+ ${hcfg}/kanshi/ - - - - ${./configs/kanshi}" - "L+ ${hcfg}/fuzzel/ - - - - ${./configs/fuzzel}" - "L+ ${hcfg}/river/ - - - - ${./configs/river}" - "L+ ${hcfg}/foot/ - - - - ${./configs/foot}" - ]; - }; + systemd.tmpfiles.rules = [ + "L+ /tmp/wallpapers/ - - - - ${inputs.wallpkgs.packages.${pkgs.system}.rose_pine}/share/wallpapers" + ]; }; } diff --git a/computers/waddledee/theme.nix b/computers/python/theme.nix similarity index 100% rename from computers/waddledee/theme.nix rename to computers/python/theme.nix diff --git a/flake.lock b/flake.lock index 7c6bece..08e03d4 100644 --- a/flake.lock +++ b/flake.lock @@ -497,9 +497,26 @@ "nixpkgs": "nixpkgs_3", "nixpkgs-f2k": "nixpkgs-f2k", "pankomacs": "pankomacs", + "rosepine-qutebrowser": "rosepine-qutebrowser", "wallpkgs": "wallpkgs" } }, + "rosepine-qutebrowser": { + "flake": false, + "locked": { + "lastModified": 1727782681, + "narHash": "sha256-B7wdXdBpBxVmX1hWM4SNY/dVsTiIPo7acla9s0Bw3Wc=", + "owner": "aalbegr", + "repo": "qutebrowser-rose-pine", + "rev": "3e7deb5a3d8bb33fd9b173b69b3407615b381f98", + "type": "github" + }, + "original": { + "owner": "aalbegr", + "repo": "qutebrowser-rose-pine", + "type": "github" + } + }, "rust-analyzer-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index ef74b94..9de864e 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,12 @@ url = "https://codeberg.org/amadaluzia/pankomacs.git"; ref = "main"; }; + rosepine-qutebrowser = { + type = "github"; + owner = "aalbegr"; + repo = "qutebrowser-rose-pine"; + flake = false; + }; }; outputs = inputs @ { nixpkgs, @@ -56,6 +62,7 @@ ./overlays inputs.git-hooks-nix.flakeModule ]; + flake = {inherit lib;}; perSystem = { config, pkgs, diff --git a/overlays/default.nix b/overlays/default.nix index 5449c9c..50764c2 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,12 +1,6 @@ {inputs, ...}: { - flake.overlays.default = _final: prev: { - i-found-my-sddm-theme = prev.where-is-my-sddm-theme.override { - themeConfig.General = { - backgroundFill = "#161616"; - basicTextColor = "#f2f4f8"; - }; - }; - fairfax = prev.callPackage ./derivations/fairfax.nix {}; + flake.overlays.default = final: _prev: { + fairfax = final.callPackage ./derivations/fairfax.nix {}; }; perSystem = { pkgs, diff --git a/overlays/derivations/fairfax.nix b/overlays/derivations/fairfax.nix index 5b21b4a..cd8f2cd 100644 --- a/overlays/derivations/fairfax.nix +++ b/overlays/derivations/fairfax.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation { }; }; installPhase = '' - mkdir -p $out/share/fonts - cp *.ttf $out/share/fonts + mkdir -p $out/share/fonts/Fairfax + cp *.ttf $out/share/fonts/Fairfax ''; }