From a4ce7db9c96fee2eb22b080b0e9dafcc6e352495 Mon Sep 17 00:00:00 2001 From: atagen Date: Fri, 4 Oct 2024 10:44:06 +1000 Subject: [PATCH] weenie mode Revert "weenie mode" This reverts commit ce8c23e0e6facd493c79c68c27c278dac2794d94. Reapply "weenie mode" This reverts commit 440088f2e5d91e0d4730a6451637b0325f7fb931. --- .old/pkgs/default.nix | 4 +- flake.lock | 171 +++++++++++------------------- flake.nix | 5 + home/home.nix | 8 +- home/programs/ollama.nix | 4 +- system/configuration.nix | 1 + system/modules/anal-retentive.nix | 27 +++++ system/modules/term.nix | 12 +-- system/quiver.nix | 1 - 9 files changed, 105 insertions(+), 128 deletions(-) create mode 100644 system/modules/anal-retentive.nix diff --git a/.old/pkgs/default.nix b/.old/pkgs/default.nix index dec0e83..c7292eb 100644 --- a/.old/pkgs/default.nix +++ b/.old/pkgs/default.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { - hyprland-system76-scheduler-integration = pkgs.callPackage ./hyprland-system76-scheduler-integration.nix {}; + # hyprland-system76-scheduler-integration = pkgs.callPackage ./hyprland-system76-scheduler-integration.nix {}; culr = pkgs.callPackage ./culr.nix {}; - eww-git = pkgs.callPackage ./eww.nix {}; + # eww-git = pkgs.callPackage ./eww.nix {}; # everforest-theme = pkgs.callPackage ./everforst-theme.nix {}; # coconut = pkgs.python310Packages.callPackage ./coconut.nix {}; # kanagawa-icons = pkgs.callPackage ./kanagawa-icons.nix {}; diff --git a/flake.lock b/flake.lock index 2705c16..5726545 100644 --- a/flake.lock +++ b/flake.lock @@ -87,28 +87,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-root": { "locked": { "lastModified": 1713493429, @@ -238,11 +216,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1726708551, - "narHash": "sha256-2mFUjYNMPftdhR8DNCCsrV6edCOx/bTzlEE3w9gmK8Q=", + "lastModified": 1727975286, + "narHash": "sha256-NXHi7FWTV0eRO60Fy6Xfvy+fU8pjnaZWCiFr1dqQfxM=", "owner": "helix-editor", "repo": "helix", - "rev": "9f93de5a4b2b52a1a153f4ea5eacfc1a63600496", + "rev": "02b6f1488a4a1438b268f87d96c474a946ea3e5e", "type": "github" }, "original": { @@ -258,11 +236,11 @@ ] }, "locked": { - "lastModified": 1725406787, - "narHash": "sha256-ifkeLCv4vcsDC7MgvGGb++crmUeJ0+QG8L4mg8Bn7GM=", + "lastModified": 1727875173, + "narHash": "sha256-pC6J9cHtTREsZvSIoySj//cRltGYphgR9pV4/vMA3Z4=", "owner": "n-hass", "repo": "home-manager", - "rev": "df5d577ff94303f7f4ffc58e83986274ecec924c", + "rev": "6aa79fd47e5d657257ebc4756dd2fdbe3aadabe8", "type": "github" }, "original": { @@ -291,11 +269,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1726702585, - "narHash": "sha256-oBo2DRCazfJV/qUTgUGcS9s694sHNsIs5U09cOszeAc=", - "rev": "79246a37337c5df2224dbc2461c722e1e678f6de", + "lastModified": 1727783747, + "narHash": "sha256-fLiDo55WLgikMaaZcFEpkCkL4fQiV7RNEjRn+LxiYao=", + "rev": "775292766025380d04004e42fefbdb8ca40b3fa3", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/79246a37337c5df2224dbc2461c722e1e678f6de.tar.gz?rev=79246a37337c5df2224dbc2461c722e1e678f6de" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/775292766025380d04004e42fefbdb8ca40b3fa3.tar.gz?rev=775292766025380d04004e42fefbdb8ca40b3fa3" }, "original": { "type": "tarball", @@ -314,11 +292,11 @@ ] }, "locked": { - "lastModified": 1726631249, - "narHash": "sha256-b2rMO8+jKjY55d8uynX7FjV4NIPu/WzPux0kWOAzwoo=", - "rev": "b0e6f359500d66670cc16f521e4f62d6a0a4864e", + "lastModified": 1727752861, + "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", + "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b0e6f359500d66670cc16f521e4f62d6a0a4864e.tar.gz?rev=b0e6f359500d66670cc16f521e4f62d6a0a4864e" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d" }, "original": { "type": "tarball", @@ -360,8 +338,8 @@ "utils": "utils" }, "locked": { - "lastModified": 1726786214, - "narHash": "sha256-+USHngJZ1XzPbyiNBGqQzBFrsBlLEhZDk77juMOUKw8=", + "lastModified": 1727941610, + "narHash": "sha256-yKbMgIsoVIHpnz/H8PEEOQClmQpw8BPN5vd3fLtrCcg=", "path": "/home/bolt/code/meat", "type": "path" }, @@ -370,6 +348,22 @@ "type": "path" } }, + "murex": { + "flake": false, + "locked": { + "lastModified": 1726693860, + "narHash": "sha256-y+7tRp4JNlefsKnMgU9d3b9pzgBJbSKGI98CzkcOjq8=", + "owner": "lmorg", + "repo": "murex", + "rev": "c03788357164e9846c84d9f777251495d9452a8e", + "type": "github" + }, + "original": { + "owner": "lmorg", + "repo": "murex", + "type": "github" + } + }, "nh": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -393,11 +387,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1726449931, - "narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=", + "lastModified": 1727658919, + "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995", + "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", "type": "github" }, "original": { @@ -428,29 +422,6 @@ "type": "github" } }, - "nix-update": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1726651036, - "narHash": "sha256-6kR4UEBZvbQNoR3l8/It5ZTCC+mB14jzj7MNnFoQJwE=", - "owner": "Mic92", - "repo": "nix-update", - "rev": "7dd0e4467c571ebb7e53d9e3d40c49f75473efdf", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-update", - "type": "github" - } - }, "nixd": { "inputs": { "flake-parts": "flake-parts", @@ -459,11 +430,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1726707834, - "narHash": "sha256-1ZOtza9NBU/2t80IQc3TJFC+cEZhDUnvmg7f4pNeOi4=", + "lastModified": 1727793617, + "narHash": "sha256-vZ+t0jvKZczYBB9ZAj7CQ1sBv9PE66G9/LkB6a+Iogg=", "owner": "nix-community", "repo": "nixd", - "rev": "a47ac2c1ea2349bdf31a41a9df2522af60a5b6e5", + "rev": "c38702b17580a31e84c958b5feed3d8c7407f975", "type": "github" }, "original": { @@ -475,17 +446,16 @@ "nixos-cosmic": { "inputs": { "flake-compat": "flake-compat_3", - "nix-update": "nix-update", "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1726733180, - "narHash": "sha256-PuZdUC+FHUcseoiXMgpAoPUNptcmmhqOsgnxfNul8TQ=", + "lastModified": 1727998575, + "narHash": "sha256-BJZRVI9tfDSGfN8pmoSE3Ftq/xSL1QKUm8qH72yZ9js=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "d065ae2b8198d4236c474470214a6aadb6a521bf", + "rev": "ff0af4770a7d7342ed91ef5b96d2cc693bbc1092", "type": "github" }, "original": { @@ -561,11 +531,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1726447378, - "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=", + "lastModified": 1727672256, + "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1", + "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", "type": "github" }, "original": { @@ -593,11 +563,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1726062873, - "narHash": "sha256-IiA3jfbR7K/B5+9byVi9BZGWTD4VSbWe8VLpp9B/iYk=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4f807e8940284ad7925ebd0a0993d2a1791acb2f", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -641,11 +611,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1726463316, - "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -657,11 +627,11 @@ }, "nur": { "locked": { - "lastModified": 1726785248, - "narHash": "sha256-4r609NVbf8nvuwyRGI8ti3qQzYpYwjfj8U2WelZhauo=", + "lastModified": 1727988362, + "narHash": "sha256-29EisH8PDWTzSgUKDj6KmyAJcv1eoNdy5Vw6IyGPPN8=", "owner": "nix-community", "repo": "NUR", - "rev": "d2f17676f18b4cbec111c4b597ccf1444da4b88c", + "rev": "47d63dcaa78c3b29d0fecc96f07a0103d7a94f1d", "type": "github" }, "original": { @@ -704,6 +674,7 @@ "lix-module": "lix-module", "madness": "madness", "meat": "meat", + "murex": "murex", "nh": "nh", "nix-index-database": "nix-index-database", "nix-rice": "nix-rice", @@ -753,11 +724,11 @@ ] }, "locked": { - "lastModified": 1726626348, - "narHash": "sha256-sYV7e1B1yLcxo8/h+/hTwzZYmaju2oObNiy5iRI0C30=", + "lastModified": 1727836133, + "narHash": "sha256-JE0zciM5IGWvK8J/pE2VldNBf7oyMH5WrU8tZArefbg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6fd52ad8bd88f39efb2c999cc971921c2fb9f3a2", + "rev": "02321540b0c8000b36889b1b974d1fec585b25a4", "type": "github" }, "original": { @@ -847,38 +818,16 @@ "type": "github" } }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719887753, - "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems_3" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 48c4d2c..f581de0 100644 --- a/flake.nix +++ b/flake.nix @@ -54,6 +54,11 @@ inputs.nh.follows = "nh"; inputs.rust-overlay.follows = "rust-overlay"; }; + + murex = { + flake = false; + url = "github:lmorg/murex"; + }; }; outputs = { diff --git a/home/home.nix b/home/home.nix index 51ca0c2..a60131d 100644 --- a/home/home.nix +++ b/home/home.nix @@ -57,9 +57,11 @@ in { }; }; - home.packages = with pkgs; - rice.fonts.pkgs - ++ rice.icons.pkgs; + home.packages = let + inherit (pkgs.rice) icons fonts; + in + fonts.pkgs + ++ icons.pkgs; systemd.user.targets.tray = { Unit = { diff --git a/home/programs/ollama.nix b/home/programs/ollama.nix index ce08366..20b3670 100644 --- a/home/programs/ollama.nix +++ b/home/programs/ollama.nix @@ -69,8 +69,8 @@ }; networks.ollama = { - Subnet = "192.168.10.0/24"; - Gateway = "192.168.10.1"; + subnet = "192.168.10.0/24"; + gateway = "192.168.10.1"; }; }; } diff --git a/system/configuration.nix b/system/configuration.nix index 81f185f..ad2e635 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -47,6 +47,7 @@ ./modules/sydney.nix ./modules/docs.nix ./modules/nix-meta.nix + ./modules/anal-retentive.nix ]; hardware.enableRedistributableFirmware = true; diff --git a/system/modules/anal-retentive.nix b/system/modules/anal-retentive.nix new file mode 100644 index 0000000..8851e48 --- /dev/null +++ b/system/modules/anal-retentive.nix @@ -0,0 +1,27 @@ +{ + pkgs, + lib, + ... +}: { + # perlless activations + boot.initrd.systemd.enable = lib.mkDefault true; + system.etc.overlay.enable = lib.mkDefault true; + services.userborn.enable = lib.mkDefault true; + + # misc perl + system.disableInstallerTools = lib.mkDefault true; + programs.less.lessopen = lib.mkDefault null; + programs.command-not-found.enable = lib.mkDefault false; + boot.enableContainers = lib.mkDefault false; + boot.loader.grub.enable = lib.mkDefault false; + environment.defaultPackages = lib.mkDefault lib.mkDefault []; + documentation.info.enable = lib.mkDefault false; + + # dare i remove it? + # environment.systemPackages = [pkgs.nixos-rebuild]; + + # no cppnix + system.systemBuilderArgs.disallowedRequisites = [pkgs.nix]; + nix.package = pkgs.lix; + system.tools.nixos-option.enable = false; +} diff --git a/system/modules/term.nix b/system/modules/term.nix index 59361f7..6dfa5b0 100644 --- a/system/modules/term.nix +++ b/system/modules/term.nix @@ -1,19 +1,13 @@ {pkgs, ...}: let - murex = pkgs.murex.overrideAttrs { - passthru = { - shellPath = "/bin/murex"; - overrideModAttrs = {}; - }; - }; + inherit (pkgs) murex; in { environment.pathsToLink = ["/share/zsh"]; programs.zsh.enable = true; environment.systemPackages = [ murex ]; - # TODO change this when they fix the helix job control issue - # users.defaultUserShell = murex; - users.defaultUserShell = pkgs.zsh; + users.defaultUserShell = murex; + # users.defaultUserShell = pkgs.zsh; console = { font = "Lat2-Terminus16"; }; diff --git a/system/quiver.nix b/system/quiver.nix index 63cd71c..a64ee9e 100644 --- a/system/quiver.nix +++ b/system/quiver.nix @@ -27,7 +27,6 @@ boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbcore" "sd_mod"]; boot.initrd.kernelModules = []; - boot.initrd.systemd.enable = true; boot.kernelModules = ["kvm-amd" "i2c-dev"]; boot.kernelParams = [ "nvidia-drm.fbdev=1"