From 185833d1fb6ae1476dd3e7c8b0dea5b1afbbc207 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 13 Nov 2024 19:30:43 -0500 Subject: [PATCH] feat: lots of things, really --- ci/common.nix | 2 +- ci/flake-cron.nix | 10 +--- ci/nodes.nix | 4 +- common/overlay.nix | 10 ++-- flake.lock | 78 +++++++++++++------------- flake.nix | 10 ++-- home/environments/gnome/extensions.nix | 3 +- home/environments/gnome/gtk.nix | 21 +++++++ home/environments/gnome/konawall.nix | 21 ++++++- home/environments/gnome/ssh.nix | 2 +- home/environments/kde/kde.nix | 2 +- home/profiles/common/base16.nix | 2 +- home/profiles/graphical/packages.nix | 1 + home/profiles/graphical/wezterm.nix | 15 +++-- nixos/environments/gnome/packages.nix | 26 ++++----- nixos/hardware/oracle_micro.nix | 8 +-- nixos/profiles/gaming/lutris.nix | 7 +-- nixos/profiles/graphical/dns.nix | 6 +- nixos/servers/matrix/discord.nix | 2 +- nixos/servers/matrix/postgres.nix | 24 ++++---- nixos/servers/matrix/synapse.nix | 6 +- packages/default.nix | 2 +- pkgs.nix | 2 +- systems/koishi.nix | 35 ++++++------ wrappers/default.nix | 21 +++---- wrappers/exports.nix | 8 +-- wrappers/nf-actions-test.nix | 14 ++--- wrappers/nf-generate.nix | 26 ++++----- 28 files changed, 200 insertions(+), 168 deletions(-) create mode 100644 home/environments/gnome/gtk.nix diff --git a/ci/common.nix b/ci/common.nix index 40496dc6..cb35899d 100644 --- a/ci/common.nix +++ b/ci/common.nix @@ -17,7 +17,7 @@ }; }; - nix.config.max-silent-time = 60 * 60; + nix.config.max-silent-time = 60 * 60; /* nix.config = { extra-platforms = ["aarch64-linux" "armv6l-linux" "armv7l-linux"]; diff --git a/ci/flake-cron.nix b/ci/flake-cron.nix index 3b6b3aef..6b7644be 100644 --- a/ci/flake-cron.nix +++ b/ci/flake-cron.nix @@ -1,13 +1,9 @@ { lib, config, - channels, - pkgs, ... }: -with lib; let - inherit (channels.std) string list set; -in { +with lib; { imports = [./common.nix]; config = { name = "flake-update"; @@ -43,9 +39,9 @@ in { name = "flake update build"; order = 500; run = "nix run .#nf-update"; - env = { + env = { CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; + CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NF_UPDATE_GIT_COMMIT = "1"; NF_UPDATE_CACHIX_PUSH = "1"; diff --git a/ci/nodes.nix b/ci/nodes.nix index 0623376b..ef3869f3 100644 --- a/ci/nodes.nix +++ b/ci/nodes.nix @@ -42,7 +42,7 @@ in { run = "nix run .#nf-build-system -- nixosConfigurations.${name}.config.system.build.toplevel ${name} NixOS"; env = { CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; + CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NF_UPDATE_CACHIX_PUSH = "1"; NF_CONFIG_ROOT = "\${{ github.workspace }}"; @@ -57,7 +57,7 @@ in { run = "nix run .#nf-build-system -- homeConfigurations.${name}.activationPackage ${name} Home"; env = { CACHIX_AUTH_TOKEN = "\${{ secrets.CACHIX_AUTH_TOKEN }}"; - CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; + CACHIX_SIGNING_KEY = "\${{ secrets.CACHIX_SIGNING_KEY }}"; DISCORD_WEBHOOK_LINK = "\${{ secrets.DISCORD_WEBHOOK_LINK }}"; NF_UPDATE_CACHIX_PUSH = "1"; NF_CONFIG_ROOT = "\${{ github.workspace }}"; diff --git a/common/overlay.nix b/common/overlay.nix index 1f9c92bf..bb552e37 100644 --- a/common/overlay.nix +++ b/common/overlay.nix @@ -6,10 +6,10 @@ nixpkgs = { overlays = import tree.overlays {inherit inputs tree;}; config = { - allowUnfree = true; - permittedInsecurePackages = [ - "olm-3.2.16" - ]; - }; + allowUnfree = true; + permittedInsecurePackages = [ + "olm-3.2.16" + ]; + }; }; } diff --git a/flake.lock b/flake.lock index a0262980..ee319cfb 100644 --- a/flake.lock +++ b/flake.lock @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1729826725, - "narHash": "sha256-w3WNlYxqWYsuzm/jgFPyhncduoDNjot28aC8j39TW0U=", + "lastModified": 1731454423, + "narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "7840909b00fbd5a183008a6eb251ea307fe4a76e", + "rev": "6c71c49e2448e51ad830ed211024e6d0edc50116", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1729864948, - "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=", + "lastModified": 1731535640, + "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0", + "rev": "35b055009afd0107b69c286fca34d2ad98940d57", "type": "github" }, "original": { @@ -438,11 +438,11 @@ ] }, "locked": { - "lastModified": 1729734363, - "narHash": "sha256-qSAmcOBaCadTe9VkoNHUmgzJoYy42RE9tSgbGIDQ34M=", + "lastModified": 1731375802, + "narHash": "sha256-CvWPEzrl2EA3xrtg9X6K8aqV7T5r0SaDz6PLpGA0yIY=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "f3795fcc37f37ae8c488e70e2cf8a85e43043722", + "rev": "b873a123366b9a62f9262414ada8d83b03f1f0bf", "type": "github" }, "original": { @@ -458,11 +458,11 @@ ] }, "locked": { - "lastModified": 1729394935, - "narHash": "sha256-2ntUG+NJKdfhlrh/tF+jOU0fOesO7lm5ZZVSYitsvH8=", + "lastModified": 1731209121, + "narHash": "sha256-BF7FBh1hIYPDihdUlImHGsQzaJZVLLfYqfDx41wjuF0=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "04f8a11f247ba00263b060fbcdc95484fd046104", + "rev": "896019f04b22ce5db4c0ee4f89978694f44345c3", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729742320, - "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", + "lastModified": 1731403644, + "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", + "rev": "f6581f1c3b137086e42a08a906bdada63045f991", "type": "github" }, "original": { @@ -518,11 +518,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729665710, - "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "lastModified": 1731139594, + "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2", "type": "github" }, "original": { @@ -534,11 +534,11 @@ }, "nur": { "locked": { - "lastModified": 1729874852, - "narHash": "sha256-ngJHU3jXU7pSSyG0diRIotgnLf2us6XR/jBSlYGD1hU=", + "lastModified": 1731537929, + "narHash": "sha256-8BN+r2bHiuERmxNcfME82ciiMkgJ+ZLAKSvFnNbVCgY=", "owner": "nix-community", "repo": "NUR", - "rev": "e39356f189144007b6ff29a82429c6486c59a034", + "rev": "bd5ead048fb2a5bb3635111761d2d75f1f19debc", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1729710171, - "narHash": "sha256-2sVt2hbL+G0FzEESm/EZBewPOmNtZ6MTnYhsvHJW6Rs=", + "lastModified": 1731193165, + "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=", "owner": "pjones", "repo": "plasma-manager", - "rev": "247a8e677b51f053ca89dcf67059e24f85e47391", + "rev": "f33173b9d22e554a6f869626bc01808d35995257", "type": "github" }, "original": { @@ -666,11 +666,11 @@ ] }, "locked": { - "lastModified": 1726280639, - "narHash": "sha256-YfLRPlFZWrT2oRLNAoqf7G3+NnUTDdlIJk6tmBU7kXM=", + "lastModified": 1729477859, + "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e9f8641c92f26fd1e076e705edb12147c384171d", + "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1", "type": "github" }, "original": { @@ -715,11 +715,11 @@ ] }, "locked": { - "lastModified": 1729775275, - "narHash": "sha256-J2vtHq9sw1wWm0aTMXpEEAzsVCUMZDTEe5kiBYccpLE=", + "lastModified": 1731364708, + "narHash": "sha256-HC0anOL+KmUQ2hdRl0AtunbAckasxrkn4VLmxbW/WaA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "78a0e634fc8981d6b564f08b6715c69a755c4c7d", + "rev": "4c91d52db103e757fc25b58998b0576ae702d659", "type": "github" }, "original": { @@ -812,11 +812,11 @@ ] }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -841,11 +841,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1729006311, - "narHash": "sha256-1xtKJHu6CFnOhp4snof+WSTwcdPgwIaD6mBODP/cv3w=", + "lastModified": 1730734444, + "narHash": "sha256-lNgCAphrq3/bYGjgDxEl2rVcer6GnmfWXDhxc+kdYOk=", "owner": "wez", "repo": "wezterm", - "rev": "9ddca7bde92090792dbcdc65c1e9897c362196d7", + "rev": "51c794ac500a2033b9dc570c71810518bfa667a9", "type": "github" }, "original": { @@ -869,11 +869,11 @@ ] }, "locked": { - "lastModified": 1729717678, - "narHash": "sha256-XEfYT1D+4KT9c0mMwsmZdWS2JgKsboAZbnuJvrjBQKg=", + "lastModified": 1730453870, + "narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "5a965cb108fb1f30b29a26dbc29b473f49e80b41", + "rev": "adb6bc4b661a43328752b4575be4968a4990c033", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 65df3465..32b77341 100644 --- a/flake.nix +++ b/flake.nix @@ -28,11 +28,11 @@ }; }; wezterm = { - url = "github:wez/wezterm/main?dir=nix"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils"; - }; + url = "github:wez/wezterm/main?dir=nix"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "utils"; + }; }; ci = { url = "github:arcnmx/ci/v0.7"; diff --git a/home/environments/gnome/extensions.nix b/home/environments/gnome/extensions.nix index 986fdd7d..c27766e9 100644 --- a/home/environments/gnome/extensions.nix +++ b/home/environments/gnome/extensions.nix @@ -15,7 +15,7 @@ ]; }; "org/gnome/shell/extensions/date-menu-formatter" = { - pattern = "y-MM-dd kk:mm XXX"; + pattern = "y-MM-dd HH:mm Z"; "font-size" = "12"; }; "org/gnome/shell/extensions/vitals" = { @@ -28,6 +28,7 @@ space-bar user-themes tray-icons-reloaded + appindicator vitals dash-to-panel date-menu-formatter diff --git a/home/environments/gnome/gtk.nix b/home/environments/gnome/gtk.nix new file mode 100644 index 00000000..1e5f8d16 --- /dev/null +++ b/home/environments/gnome/gtk.nix @@ -0,0 +1,21 @@ +{pkgs, ...}: { + gtk = { + enable = true; + iconTheme = { + name = "Numix-Square"; + package = pkgs.numix-icon-theme-square; + }; + + theme = { + name = "Arc-Dark"; + package = pkgs.arc-theme; + }; + + cursorTheme = { + name = "Numix-Cursor"; + package = pkgs.numix-cursor-theme; + }; + }; + + home.sessionVariables.GTK_THEME = "Arc-Dark"; +} diff --git a/home/environments/gnome/konawall.nix b/home/environments/gnome/konawall.nix index e1739583..0bea31fa 100644 --- a/home/environments/gnome/konawall.nix +++ b/home/environments/gnome/konawall.nix @@ -3,7 +3,26 @@ pkgs, inputs, ... -}: { +}: let + konawallConfig = { + interval = 30 * 60; + rotate = true; + source = "konachan"; + tags = [ + "rating:s" + "touhou" + "score:>=50" + "width:>=1500" + ]; + logging = { + file = "INFO"; + console = "DEBUG"; + }; + }; +in { + xdg.configFile = { + "konawall/config.toml".source = (pkgs.formats.toml {}).generate "konawall-config" konawallConfig; + }; systemd.user.services.konawall-py-gnome = { Unit = { Description = "konawall-py"; diff --git a/home/environments/gnome/ssh.nix b/home/environments/gnome/ssh.nix index c279ca6e..28104912 100644 --- a/home/environments/gnome/ssh.nix +++ b/home/environments/gnome/ssh.nix @@ -9,7 +9,7 @@ in { # Disable gnome-keyring ssh-agent xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = '' - ${fileContents "${pkgs.gnome3.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"} + ${fileContents "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"} Hidden=true ''; } diff --git a/home/environments/kde/kde.nix b/home/environments/kde/kde.nix index fed281fc..bc7b02a6 100644 --- a/home/environments/kde/kde.nix +++ b/home/environments/kde/kde.nix @@ -57,7 +57,7 @@ "kdeglobals"."WM"."inactiveBlend" = "231,232,235"; "kdeglobals"."WM"."inactiveForeground" = "163,165,172"; "kdeglobals"."General"."BrowserApplication" = "firefox.desktop"; - "kdeglobals"."General"."TerminalApplication" = "wezterm start --cwd ."; + "kdeglobals"."General"."TerminalApplication" = "konsole"; "kdeglobals"."General"."TerminalService" = "org.wezfurlong.wezterm.desktop"; "kxkbrc"."Layout"."ResetOldOptions" = true; "plasmarc"."Theme"."name" = "Arc"; diff --git a/home/profiles/common/base16.nix b/home/profiles/common/base16.nix index f78e9259..650d1025 100644 --- a/home/profiles/common/base16.nix +++ b/home/profiles/common/base16.nix @@ -22,6 +22,6 @@ in { ansi.palette.background.alpha = "ee00"; }; }; - defaultSchemeName = "light"; + defaultSchemeName = "dark"; }; } diff --git a/home/profiles/graphical/packages.nix b/home/profiles/graphical/packages.nix index 6f236db6..34c3e0ea 100644 --- a/home/profiles/graphical/packages.nix +++ b/home/profiles/graphical/packages.nix @@ -12,6 +12,7 @@ # Music spotify + strawberry-qt6 # Chat fractal # Matrix diff --git a/home/profiles/graphical/wezterm.nix b/home/profiles/graphical/wezterm.nix index 79fc015b..3cc46ae7 100644 --- a/home/profiles/graphical/wezterm.nix +++ b/home/profiles/graphical/wezterm.nix @@ -1,14 +1,15 @@ -{ inputs, pkgs, ... }: { +{ + inputs, + pkgs, + ... +}: { programs.wezterm = { enable = true; - #package = inputs.wezterm.outputs.packages.${pkgs.system}.default; + package = inputs.wezterm.outputs.packages.${pkgs.system}.default; extraConfig = '' local wezterm = require 'wezterm'; return { - front_end=‘WebGpu’, font = wezterm.font_with_fallback({ - -- /nix/store/rh47mw5pfp7w2nmkn8rlwjkmkzf11prq-monaspace-1.000/share/fonts/opentype/MonaspaceKrypton-Regular.otf, FontConfig - "Monaspace Krypton", -- , BuiltIn "JetBrains Mono", @@ -22,9 +23,11 @@ "Symbols Nerd Font Mono", }), + window_decorations = "TITLE | RESIZE", + enable_wayland = false, + warn_about_missing_glyphs = false, font_size = 10.0, check_for_updates = false, - show_update_window = false, enable_tab_bar = false } ''; diff --git a/nixos/environments/gnome/packages.nix b/nixos/environments/gnome/packages.nix index bfdfd338..163c659d 100644 --- a/nixos/environments/gnome/packages.nix +++ b/nixos/environments/gnome/packages.nix @@ -1,19 +1,17 @@ {pkgs, ...}: { - environment.gnome.excludePackages = - (with pkgs; [ - gnome-photos - gnome-tour - ]) - ++ (with pkgs.gnome; [ - cheese # webcam tool - epiphany # web browser - geary # email reader - gnome-characters - gnome-contacts - gnome-initial-setup - ]); + environment.gnome.excludePackages = with pkgs; [ + gnome-photos + gnome-tour + cheese # webcam tool + epiphany # web browser + geary # email reader + gnome-characters + gnome-contacts + gnome-initial-setup + ]; environment.systemPackages = with pkgs; [ - gnome.gnome-tweaks + gnome-tweaks gnome-extension-manager ]; + services.udev.packages = [pkgs.gnome.gnome-settings-daemon]; } diff --git a/nixos/hardware/oracle_micro.nix b/nixos/hardware/oracle_micro.nix index 8fbbdf41..81476866 100644 --- a/nixos/hardware/oracle_micro.nix +++ b/nixos/hardware/oracle_micro.nix @@ -12,10 +12,10 @@ }; systemd-boot.configurationLimit = 1; }; - initrd = { - availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; - kernelModules = ["nvme"]; - }; + initrd = { + availableKernelModules = ["ata_piix" "uhci_hcd" "xen_blkfront" "vmw_pvscsi"]; + kernelModules = ["nvme"]; + }; }; fileSystems = { "/boot" = { diff --git a/nixos/profiles/gaming/lutris.nix b/nixos/profiles/gaming/lutris.nix index a1d1fee0..018d5a5a 100644 --- a/nixos/profiles/gaming/lutris.nix +++ b/nixos/profiles/gaming/lutris.nix @@ -1,11 +1,10 @@ {pkgs, ...}: { + hardware.opengl = { + driSupport32Bit = true; + }; hardware.graphics = { enable32Bit = true; - extraPackages = with pkgs; [ - amdvlk - ]; extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk driversi686Linux.mesa ]; }; diff --git a/nixos/profiles/graphical/dns.nix b/nixos/profiles/graphical/dns.nix index 888cb37c..446f40fd 100644 --- a/nixos/profiles/graphical/dns.nix +++ b/nixos/profiles/graphical/dns.nix @@ -4,10 +4,10 @@ in { networking = { networkmanager.dns = mkForce "none"; nameservers = [ - "172.20.0.1" - /*"1.1.1.1#cloudflare-dns.com" + #"172.20.0.1" + "1.1.1.1#cloudflare-dns.com" "1.0.0.1#cloudflare-dns.com" - "8.8.8.8#dns.google"*/ + "8.8.8.8#dns.google" ]; }; services.resolved = { diff --git a/nixos/servers/matrix/discord.nix b/nixos/servers/matrix/discord.nix index 4e841d0c..a799b17f 100644 --- a/nixos/servers/matrix/discord.nix +++ b/nixos/servers/matrix/discord.nix @@ -1,4 +1,4 @@ -{config, ...}: { +_: { services.mx-puppet-discord = { #inherit (config.services.matrix-synapse) enable; settings = { diff --git a/nixos/servers/matrix/postgres.nix b/nixos/servers/matrix/postgres.nix index 64758a2a..a111d4da 100644 --- a/nixos/servers/matrix/postgres.nix +++ b/nixos/servers/matrix/postgres.nix @@ -1,13 +1,13 @@ _: { - services.postgresql = { - ensureUsers = [ - { - name = "matrix-synapse"; - ensureDBOwnership = true; - } - ]; - ensureDatabases = [ - "matrix-synapse" - ]; - }; -} \ No newline at end of file + services.postgresql = { + ensureUsers = [ + { + name = "matrix-synapse"; + ensureDBOwnership = true; + } + ]; + ensureDatabases = [ + "matrix-synapse" + ]; + }; +} diff --git a/nixos/servers/matrix/synapse.nix b/nixos/servers/matrix/synapse.nix index fc0b4394..8b182792 100644 --- a/nixos/servers/matrix/synapse.nix +++ b/nixos/servers/matrix/synapse.nix @@ -24,11 +24,13 @@ in { allow_guest_access = true; suppress_key_server_warning = true; use_appservice_legacy_authorization = true; - /*app_service_config_files = [ + /* + app_service_config_files = [ "/var/lib/matrix-synapse/discord-registration.yaml" "/var/lib/matrix-synapse/whatsapp-registration.yaml" "/var/lib/matrix-synapse/telegram-registration.yaml" - ];*/ + ]; + */ log_config = pkgs.writeText "nya.yaml" '' version: 1 formatters: diff --git a/packages/default.nix b/packages/default.nix index c73b2597..7894374b 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -6,4 +6,4 @@ # formerly final: prev:, but deadnix inherit (inputs.std.lib) set; in - (set.map (_: package: prev.callPackage package {}) (removeAttrs tree.packages ["default"])) \ No newline at end of file + set.map (_: package: prev.callPackage package {}) (removeAttrs tree.packages ["default"]) diff --git a/pkgs.nix b/pkgs.nix index 51161811..869f758f 100644 --- a/pkgs.nix +++ b/pkgs.nix @@ -11,7 +11,7 @@ in config = { allowUnfree = true; permittedInsecurePackages = [ - "olm-3.2.16" + "olm-3.2.16" ]; }; }; diff --git a/systems/koishi.nix b/systems/koishi.nix index b8001724..0e9ab9f1 100644 --- a/systems/koishi.nix +++ b/systems/koishi.nix @@ -19,7 +19,8 @@ _: let secureboot ]) ++ (with tree.nixos.environments; [ - kde + #kde + gnome ]); config = { home-manager.users.kat.imports = @@ -28,27 +29,28 @@ _: let devops ]) ++ (with tree.home.environments; [ - kde + #kde + gnome ]); - fileSystems."/" = - { device = "/dev/disk/by-uuid/ea521d6e-386f-4e6d-adde-c4be376cf19b"; - fsType = "xfs"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/ea521d6e-386f-4e6d-adde-c4be376cf19b"; + fsType = "xfs"; + }; - boot.initrd.luks.devices."cryptmapper".device = "/dev/disk/by-uuid/16296ac6-b8b2-4c4e-94f6-c06ea84d6fbb"; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/C6C8-14D2"; + fsType = "vfat"; + options = ["fmask=0022" "dmask=0022"]; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/C6C8-14D2"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/7486e618-214b-47ff-87a7-0d53099a05b4"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/7486e618-214b-47ff-87a7-0d53099a05b4";} + ]; boot = { + initrd.luks.devices."cryptmapper".device = "/dev/disk/by-uuid/16296ac6-b8b2-4c4e-94f6-c06ea84d6fbb"; + loader.grub.useOSProber = true; extraModprobeConfig = "options snd_hda_intel power_save=0"; extraModulePackages = [config.boot.kernelPackages.v4l2loopback.out]; }; @@ -60,7 +62,6 @@ _: let IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh ''; - boot.loader.grub.useOSProber = true; nix = { buildMachines = [ { diff --git a/wrappers/default.nix b/wrappers/default.nix index fccfdb26..d493dba0 100644 --- a/wrappers/default.nix +++ b/wrappers/default.nix @@ -1,12 +1,9 @@ -{ - inputs, - ... -}@args: - inputs.utils.lib.eachDefaultSystem (system: let - newArgs = args // { inherit system; }; - in { - packages = { - nf-actions-test = import ./nf-actions-test.nix newArgs; - nf-generate = import ./nf-generate.nix newArgs; - }; - }) \ No newline at end of file +{inputs, ...} @ args: +inputs.utils.lib.eachDefaultSystem (system: let + newArgs = args // {inherit system;}; +in { + packages = { + nf-actions-test = import ./nf-actions-test.nix newArgs; + nf-generate = import ./nf-generate.nix newArgs; + }; +}) diff --git a/wrappers/exports.nix b/wrappers/exports.nix index f738cd74..4a6b35c1 100644 --- a/wrappers/exports.nix +++ b/wrappers/exports.nix @@ -1,9 +1,5 @@ -{ - system, - inputs, - ... -}: let - inherit (inputs.std.lib) string list set; +{inputs, ...}: let + inherit (inputs.std.lib) string set; inherit (inputs.self) systems; enabledNixosSystems = set.filter (_: system: system.config.ci.enable && system.config.type == "NixOS") systems; in { diff --git a/wrappers/nf-actions-test.nix b/wrappers/nf-actions-test.nix index d6b8ff90..dda955e7 100644 --- a/wrappers/nf-actions-test.nix +++ b/wrappers/nf-actions-test.nix @@ -2,16 +2,14 @@ system, inputs, ... -}@args: let - lib = inputs.nixpkgs.lib; +} @ args: let exportFile = import ./exports.nix args; inherit (exportFile) exports exportsSystems; - inherit (inputs.std.lib) string list set; - packages = inputs.self.packages.${system}; inherit (inputs.self.legacyPackages.${system}) pkgs; nf-actions-test = pkgs.writeShellScriptBin "nf-actions-test" '' - ${exports} - ${exportsSystems} - source ${./actions-test.sh} + ${exports} + ${exportsSystems} + source ${./actions-test.sh} ''; -in nf-actions-test +in + nf-actions-test diff --git a/wrappers/nf-generate.nix b/wrappers/nf-generate.nix index bfab46a0..70e1e359 100644 --- a/wrappers/nf-generate.nix +++ b/wrappers/nf-generate.nix @@ -2,20 +2,20 @@ system, inputs, ... -}@args: let - lib = inputs.nixpkgs.lib; +} @ args: let + inherit (inputs.nixpkgs) lib; exportFile = import ./exports.nix args; - inherit (exportFile) exports exportsSystems; + inherit (exportFile) exports; inherit (lib.strings) makeBinPath; - inherit (inputs.std.lib) string list set; - packages = inputs.self.packages.${system}; + inherit (inputs.std.lib) string; inherit (inputs.self.legacyPackages.${system}) pkgs; inherit (import ../ci/nix.nix) ci; - nf-generate = pkgs.writeShellScriptBin "nf-generate" '' - ${exports} - export PATH="$PATH:${makeBinPath [pkgs.jq]}" - NF_INPUT_CI=${string.escapeShellArg inputs.ci} - NF_CONFIG_FILES=(${string.concatMapSep " " string.escapeShellArg ci.workflowConfigs}) - source ${./generate.sh} - ''; -in nf-generate \ No newline at end of file + nf-generate = pkgs.writeShellScriptBin "nf-generate" '' + ${exports} + export PATH="$PATH:${makeBinPath [pkgs.jq]}" + NF_INPUT_CI=${string.escapeShellArg inputs.ci} + NF_CONFIG_FILES=(${string.concatMapSep " " string.escapeShellArg ci.workflowConfigs}) + source ${./generate.sh} + ''; +in + nf-generate