From 0ec5dc82c0596c5dd7ad708b983674baf927a50e Mon Sep 17 00:00:00 2001 From: Luna Simons Date: Wed, 11 Dec 2024 08:30:01 +0100 Subject: [PATCH] chore: guh --- flake.lock | 99 ++++++++++++++++++++++------ flake.nix | 9 +-- lib/module.nix | 5 +- modules/home/cura/default.nix | 7 +- modules/home/hyprland/default.nix | 2 +- modules/home/stylix/default.nix | 2 +- modules/nixos/networking/default.nix | 14 +++- pkgs/cura5/default.nix | 12 ---- 8 files changed, 106 insertions(+), 44 deletions(-) delete mode 100644 pkgs/cura5/default.nix diff --git a/flake.lock b/flake.lock index f4a455c..c60adf3 100644 --- a/flake.lock +++ b/flake.lock @@ -28,14 +28,13 @@ "locked": { "lastModified": 1708890466, "narHash": "sha256-LlrC09LoPi8OPYOGPXegD72v+//VapgAqhbOFS3i8sc=", - "owner": "senchopens", + "owner": "SenchoPens", "repo": "base16.nix", "rev": "665b3c6748534eb766c777298721cece9453fdae", "type": "github" }, "original": { - "owner": "senchopens", - "ref": "665b3c6748534eb766c777298721cece9453fdae", + "owner": "SenchoPens", "repo": "base16.nix", "type": "github" } @@ -234,6 +233,27 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -326,11 +346,11 @@ }, "hardware": { "locked": { - "lastModified": 1733481457, - "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -349,11 +369,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733787101, - "narHash": "sha256-Gon6pLw9q0ps4u29dHe1rySKWRwTIjhT/rO0un2QKqY=", + "lastModified": 1733858674, + "narHash": "sha256-u5IFTMAd/z9xJLizanF+HPpYOppS+eLgsLgDr2oalL8=", "owner": "helix-editor", "repo": "helix", - "rev": "5005c14e99ff5037ed29a8c0a9119a564943c768", + "rev": "89a7cde2f05fbf2eae212d9301301a8377432be5", "type": "github" }, "original": { @@ -393,11 +413,11 @@ ] }, "locked": { - "lastModified": 1733754861, - "narHash": "sha256-3JKzIou54yjiMVmvgdJwopekEvZxX3JDT8DpKZs4oXY=", + "lastModified": 1733873195, + "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "9ebaa80a227eaca9c87c53ed515ade013bc2bca9", + "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "type": "github" }, "original": { @@ -484,11 +504,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733581040, - "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -538,10 +558,31 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1733899285, + "narHash": "sha256-CKT0tby8kVlfkPOYG7HyvyMh5s93yEEGyT1ZLZJMBdY=", + "owner": "nix-community", + "repo": "nur", + "rev": "9b5a2bf776bf1fa971c27e9f909483b9cee3ff8f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nur", + "type": "github" + } + }, "root": { "inputs": { "aagl": "aagl", - "base16": "base16", "disko": "disko", "fenix": "fenix", "flake-parts": "flake-parts", @@ -555,6 +596,7 @@ "nix-steel": "nix-steel", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", + "nur": "nur", "stylix": "stylix" } }, @@ -623,9 +665,7 @@ }, "stylix": { "inputs": { - "base16": [ - "base16" - ], + "base16": "base16", "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", @@ -752,6 +792,27 @@ "repo": "tinted-tmux", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 19b18db..cb60214 100644 --- a/flake.nix +++ b/flake.nix @@ -31,15 +31,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # TODO: https://github.com/danth/stylix/issues/642 - base16.url = "github:senchopens/base16.nix?ref=665b3c6748534eb766c777298721cece9453fdae"; - stylix = { url = "github:danth/stylix?ref=5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f"; inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; - base16.follows = "base16"; }; }; @@ -67,6 +63,11 @@ url = "github:ezkea/aagl-gtk-on-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + nur = { + url = "github:nix-community/nur"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = {flake-parts, ...} @ inputs: diff --git a/lib/module.nix b/lib/module.nix index 4bdbc5a..bfdd657 100644 --- a/lib/module.nix +++ b/lib/module.nix @@ -12,7 +12,10 @@ in { mkPkgs = system: import inputs.nixpkgs { inherit system; - overlays = with outputs.overlays; [pkgs]; + overlays = [ + outputs.overlays.pkgs + inputs.nur.overlays.default + ]; config.allowUnfree = true; }; diff --git a/modules/home/cura/default.nix b/modules/home/cura/default.nix index 6ab007d..21db433 100644 --- a/modules/home/cura/default.nix +++ b/modules/home/cura/default.nix @@ -2,7 +2,6 @@ lib, config, pkgs, - inputs, ... }: let inherit (lib) mkIf mkOption types; @@ -18,10 +17,8 @@ in { }; config = mkIf cfg.enable { - home = let - inherit (inputs.nixpkgs-stable.legacyPackages.${pkgs.system}) cura; - in { - packages = with pkgs; [cura cura5]; + home = { + packages = [pkgs.nur.repos.xeals.cura5]; persistence."/persist/home/bddvlpr".directories = [ ".config/cura" diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index d70ec0c..8f27dab 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -61,7 +61,7 @@ in { "${getExe pkgs.swaybg} -i ${config.stylix.image} --mode fill" ] ++ optionals cfg.dimmer.enable [ - "${getExe pkgs.wlsunset} -l ${toString cfg.dimmer.latitude} -L ${toString cfg.dimmer.longitude}" + "${getExe pkgs.wlsunset} -l ${toString cfg.dimmer.latitude} -L ${toString cfg.dimmer.longitude} -t 5500" ]; general = { diff --git a/modules/home/stylix/default.nix b/modules/home/stylix/default.nix index eba0b9e..c1531f3 100644 --- a/modules/home/stylix/default.nix +++ b/modules/home/stylix/default.nix @@ -51,6 +51,6 @@ in { home.packages = with pkgs; [ noto-fonts-cjk-sans - (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];}) + nerd-fonts.symbols-only ]; } diff --git a/modules/nixos/networking/default.nix b/modules/nixos/networking/default.nix index fa815cb..1e1b009 100644 --- a/modules/nixos/networking/default.nix +++ b/modules/nixos/networking/default.nix @@ -1,13 +1,25 @@ { config, host, + pkgs, ... }: let isImpermanent = config.sysc.impermanence.enable; in { networking = { hostName = host; - networkmanager.enable = true; + search = [ + "bddvlpr.cloud" + "bddvlpr.com" + "local" + ]; + networkmanager = { + enable = true; + plugins = with pkgs; [ + networkmanager-openconnect + networkmanager-openvpn + ]; + }; }; environment.persistence."/persist" = { diff --git a/pkgs/cura5/default.nix b/pkgs/cura5/default.nix deleted file mode 100644 index 97310b9..0000000 --- a/pkgs/cura5/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - appimageTools, - fetchurl, -}: -appimageTools.wrapType2 rec { - name = "cura5"; - version = "5.8.0"; - src = fetchurl { - url = "https://github.com/Ultimaker/Cura/releases/download/${version}/UltiMaker-Cura-${version}-linux-X64.AppImage"; - hash = "sha256-EojVAe+o43W80ES5BY3QgGRTxztwS+B6kIOfJOtULOg="; - }; -}