From e6bd37c5d47f042e6e16be5489255c72d2366095 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Fri, 28 Feb 2025 18:43:21 -0500 Subject: [PATCH] More changes to minimize flake footprint --- flake.lock | 610 +++++++++++++++++- flake.nix | 8 +- home/jimbo/programs/default.nix | 1 - home/jimbo/programs/fastfetch/config.jsonc | 97 --- home/jimbo/programs/fastfetch/default.nix | 7 - .../programs/fastfetch/small/default.nix | 5 - .../programs/fastfetch/small/small.jsonc | 34 - home/jimbo/programs/zsh/default.nix | 1 - home/jimbo/settings/aliases/default.nix | 3 - .../accounts/users/custom/jimbo/default.nix | 2 +- .../disks/impermanence/jimbo/default.nix | 3 +- .../disks/impermanence/jules/default.nix | 3 +- system/services/general/default.nix | 1 - system/services/general/libvirtd/default.nix | 38 +- system/services/general/tlp/default.nix | 4 - 15 files changed, 629 insertions(+), 188 deletions(-) delete mode 100644 home/jimbo/programs/fastfetch/config.jsonc delete mode 100644 home/jimbo/programs/fastfetch/default.nix delete mode 100644 home/jimbo/programs/fastfetch/small/default.nix delete mode 100644 home/jimbo/programs/fastfetch/small/small.jsonc delete mode 100644 system/services/general/tlp/default.nix diff --git a/flake.lock b/flake.lock index 08d3c07..e4d0290 100644 --- a/flake.lock +++ b/flake.lock @@ -1,11 +1,87 @@ { "nodes": { + "blender": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1734963688, + "narHash": "sha256-Pgt9FcqUJD/Mg+L2cMlvKw5z/WNDJRTg2ZvIho/2upE=", + "rev": "91297beb20864e611af6017c5eeef1b4564d7157", + "revCount": 132, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/blender-bin/1.0.12/01940c9d-feca-7111-a812-8d8ba9dd4fbd/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/blender-bin/1.0.12.tar.gz" + } + }, + "blobs": { + "flake": false, + "locked": { + "lastModified": 1604995301, + "narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=", + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "repo": "blobs", + "type": "gitlab" + } + }, + "crane": { + "inputs": { + "nixpkgs": [ + "jimhome", + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717535930, + "narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=", + "owner": "ipetkov", + "repo": "crane", + "rev": "55e7754ec31dac78980c8be45f8a28e80e370946", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, + "locked": { + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", + "owner": "nix-community", + "repo": "disko", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, + "disko_2": { + "inputs": { + "nixpkgs": [ + "jimhome", + "nixpkgs" + ] + }, "locked": { "lastModified": 1739841949, "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", @@ -20,6 +96,157 @@ "type": "github" } }, + "flake-compat": { + "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_2": { + "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_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "jimhome", + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717285511, + "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "jimhome", + "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" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "jimhome", + "lanzaboote", + "pre-commit-hooks-nix", + "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" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -41,6 +268,28 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "jimhome", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1737831083, @@ -56,13 +305,127 @@ "type": "github" } }, + "impermanence_2": { + "locked": { + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "owner": "nix-community", + "repo": "impermanence", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "impermanence", + "type": "github" + } + }, + "jimhome": { + "inputs": { + "blender": "blender", + "disko": "disko_2", + "home-manager": "home-manager_2", + "impermanence": "impermanence_2", + "lanzaboote": "lanzaboote", + "mailserver": "mailserver", + "minecraft": "minecraft", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "unstable": "unstable" + }, + "locked": { + "lastModified": 1740772812, + "narHash": "sha256-Sdc97pWPQRZ7yIlr+iHBfWIl9A2ze5OeXjQnrGYKP8o=", + "ref": "refs/heads/main", + "rev": "5712f3bc442ea7bc751e9fe02de008c46c4e3f6a", + "revCount": 594, + "type": "git", + "url": "https://git.nixfox.ca/Jimbo/nixos-config" + }, + "original": { + "type": "git", + "url": "https://git.nixfox.ca/Jimbo/nixos-config" + } + }, + "lanzaboote": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", + "nixpkgs": [ + "jimhome", + "nixpkgs" + ], + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1718178907, + "narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=", + "owner": "nix-community", + "repo": "lanzaboote", + "rev": "b627ccd97d0159214cee5c7db1412b75e4be6086", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "v0.4.1", + "repo": "lanzaboote", + "type": "github" + } + }, + "mailserver": { + "inputs": { + "blobs": "blobs", + "flake-compat": "flake-compat_2", + "nixpkgs": "nixpkgs_2", + "nixpkgs-24_11": "nixpkgs-24_11" + }, + "locked": { + "lastModified": 1734884447, + "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", + "owner": "simple-nixos-mailserver", + "repo": "nixos-mailserver", + "rev": "63209b1def2c9fc891ad271f474a3464a5833294", + "type": "gitlab" + }, + "original": { + "owner": "simple-nixos-mailserver", + "ref": "nixos-24.11", + "repo": "nixos-mailserver", + "type": "gitlab" + } + }, + "minecraft": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1739843142, + "narHash": "sha256-jpF2zYTQypG7ft7c4MoT8gitn5JAYuuv0XMVKwU8Fs0=", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "rev": "ddda2b8d3e0cfd9d76f72b05b952ee3ef1e59b5f", + "type": "github" + }, + "original": { + "owner": "Infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { @@ -71,13 +434,235 @@ "type": "indirect" } }, + "nixpkgs-24_11": { + "locked": { + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.11", + "type": "indirect" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1740603184, + "narHash": "sha256-t+VaahjQAWyA+Ctn2idyo1yxRIYpaDxMgHkgCNiMJa4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f44bd8ca21e026135061a0a57dcf3d0775b67a49", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.11", + "type": "indirect" + } + }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_4", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1739903703, + "narHash": "sha256-w2tTcjx39lJoPDaFbIxi+INIjAKE0jbIx9TNjj9ghmg=", + "owner": "nix-community", + "repo": "NUR", + "rev": "2215ad5c4347f522523715e809f5f2022509f504", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, + "pre-commit-hooks-nix": { + "inputs": { + "flake-compat": [ + "jimhome", + "lanzaboote", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "jimhome", + "lanzaboote", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1717664902, + "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "disko": "disko", "home-manager": "home-manager", "impermanence": "impermanence", - "nixpkgs": "nixpkgs", - "unstable": "unstable" + "jimhome": "jimhome", + "nixpkgs": "nixpkgs_5", + "unstable": "unstable_2" + } + }, + "rust-overlay": { + "inputs": { + "flake-utils": [ + "jimhome", + "lanzaboote", + "flake-utils" + ], + "nixpkgs": [ + "jimhome", + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717813066, + "narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "jimhome", + "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" } }, "unstable": { @@ -94,6 +679,21 @@ "ref": "nixos-unstable", "type": "indirect" } + }, + "unstable_2": { + "locked": { + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e9a8e6b..f7c1ec1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,20 @@ { inputs = { - # System inputs nixpkgs.url = "nixpkgs/nixos-24.11"; unstable.url = "nixpkgs/nixos-unstable"; impermanence.url = "github:nix-community/impermanence"; - disko = { url = "github:nix-community/disko"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # Home inputs home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + jimhome = { + url = "git+https://git.nixfox.ca/Jimbo/nixos-config"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { diff --git a/home/jimbo/programs/default.nix b/home/jimbo/programs/default.nix index 8d9da02..3d4cc35 100644 --- a/home/jimbo/programs/default.nix +++ b/home/jimbo/programs/default.nix @@ -3,7 +3,6 @@ imports = [ ./btop ./eza - ./fastfetch ./git ./headless ./neovim diff --git a/home/jimbo/programs/fastfetch/config.jsonc b/home/jimbo/programs/fastfetch/config.jsonc deleted file mode 100644 index cf59c49..0000000 --- a/home/jimbo/programs/fastfetch/config.jsonc +++ /dev/null @@ -1,97 +0,0 @@ -{ - "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", - "logo": { - "source": "xenia", - "color": { - "1": "1;97", - "2": "red", - "3": "yellow" - } - }, - "display": { - "separator": " \u001b[33m ", - "color": "red" - }, - "modules": [ - { - "type": "custom", - "format": "\u001b[1m—————————————————————————————————————" - }, - { - "type": "host", - "key": "󰌢 " - }, - { - "type": "cpu", - "key": " " - }, - { - "type": "gpu", - "key": "󰢮 " - }, - { - "type": "disk", - "folders": "/", - "key": " " - }, - { - "type": "memory", - "format": "{/1}{-}{/}{/2}{-}{/}{} / {}", - "key": " " - }, - { - "type": "display", - "compactType": "original", - "key": "󰍹 " - }, - - { - "type": "custom", - "format": "\u001b[1m—————————————————————————————————————" - }, - { - "type": "os", - "format": "{3} {12}", - "key": "󰍛 " - }, - { - "type": "kernel", - "format": "{1} {2}", - "key": " " - }, - { - "type": "wm", - "key": " " - }, - { - "type": "shell", - "key": " " - }, - { - "type": "terminal", - "key": " " - }, - { - "type": "packages", - "key": "󰆧 " - }, - { - "type": "uptime", - "key": "󰅐 " - }, - { - "type": "command", - "text": "date -d @$(stat -c %W /persist) '+%a %b %d %r %Z %Y'", - "key": "󰶡 " - }, - - { - "type": "custom", - "format": "\u001b[1m—————————————————————————————————————" - }, - { - "type": "custom", - "format": "\u001b[90m󰮯 \u001b[31m󰊠 \u001b[32m󰊠 \u001b[33m󰊠 \u001b[34m󰊠 \u001b[35m󰊠 \u001b[36m󰊠 \u001b[37m󰊠" - } - ] -} diff --git a/home/jimbo/programs/fastfetch/default.nix b/home/jimbo/programs/fastfetch/default.nix deleted file mode 100644 index b44f625..0000000 --- a/home/jimbo/programs/fastfetch/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ ... }: -{ - imports = [ ./small ]; - - programs.fastfetch.enable = true; - xdg.configFile."fastfetch/config.jsonc".source = ./config.jsonc; -} diff --git a/home/jimbo/programs/fastfetch/small/default.nix b/home/jimbo/programs/fastfetch/small/default.nix deleted file mode 100644 index d48f134..0000000 --- a/home/jimbo/programs/fastfetch/small/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ (pkgs.writeScriptBin "pfetch" "fastfetch --config ~/.config/fastfetch/small.jsonc") ]; - xdg.configFile."fastfetch/small.jsonc".source = ./small.jsonc; -} diff --git a/home/jimbo/programs/fastfetch/small/small.jsonc b/home/jimbo/programs/fastfetch/small/small.jsonc deleted file mode 100644 index 37d5040..0000000 --- a/home/jimbo/programs/fastfetch/small/small.jsonc +++ /dev/null @@ -1,34 +0,0 @@ -{ - "logo": { - "type": "small" - }, - "modules": [ - { - "type": "os", - "format": "{3} {12}", - "key": "󰍛 " - }, - { - "type": "host", - "key": "󰌢 " - }, - { - "type": "kernel", - "format": "{1} {2}", - "key": " " - }, - { - "type": "uptime", - "key": "󰅐 " - }, - { - "type": "packages", - "key": "󰆧 " - }, - { - "type": "memory", - "format": "{/1}{-}{/}{/2}{-}{/}{} / {}", - "key": " " - } - ] -} diff --git a/home/jimbo/programs/zsh/default.nix b/home/jimbo/programs/zsh/default.nix index 15ed467..0bed70e 100644 --- a/home/jimbo/programs/zsh/default.nix +++ b/home/jimbo/programs/zsh/default.nix @@ -13,7 +13,6 @@ ]; }; initExtra = '' - pfetch source ${pkgs.zsh-vi-mode}/share/zsh-vi-mode/zsh-vi-mode.plugin.zsh source ${pkgs.zsh-you-should-use}/share/zsh/plugins/you-should-use/you-should-use.plugin.zsh setopt HIST_IGNORE_SPACE diff --git a/home/jimbo/settings/aliases/default.nix b/home/jimbo/settings/aliases/default.nix index 22cc025..de6ae84 100644 --- a/home/jimbo/settings/aliases/default.nix +++ b/home/jimbo/settings/aliases/default.nix @@ -4,7 +4,6 @@ # NixOS flakedate = "doas nix flake update --flake /etc/nixos"; nhs = "doas nh os switch -R /etc/nixos"; - nhu = "flakedate && nhs"; nixclean = "nix store gc; nix store optimise"; nixpurge = "doas nix-collect-garbage --delete-old"; @@ -14,8 +13,6 @@ ff = "clear && fastfetch"; ip = "ip -c"; cat = "${pkgs.bat}/bin/bat --paging never"; - copycat = "wl-copy <"; myip = "curl ifconfig.co"; - seneca = "ssh jhampton1@matrix.senecapolytechnic.ca"; }; } diff --git a/system/accounts/users/custom/jimbo/default.nix b/system/accounts/users/custom/jimbo/default.nix index dafbea9..ec04d4a 100644 --- a/system/accounts/users/custom/jimbo/default.nix +++ b/system/accounts/users/custom/jimbo/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, jimhome, ... }: { users.users.jimbo = { hashedPassword = config.secrets.jimboAccPass; diff --git a/system/devices/disks/impermanence/jimbo/default.nix b/system/devices/disks/impermanence/jimbo/default.nix index 3ba3a92..75ef032 100644 --- a/system/devices/disks/impermanence/jimbo/default.nix +++ b/system/devices/disks/impermanence/jimbo/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { environment.persistence."/persist" = { hideMounts = true; @@ -8,7 +8,6 @@ "Documents" "Pictures" "Videos" - "Games" "VMs" ".snapshots" diff --git a/system/devices/disks/impermanence/jules/default.nix b/system/devices/disks/impermanence/jules/default.nix index b583c5a..b10c5cd 100644 --- a/system/devices/disks/impermanence/jules/default.nix +++ b/system/devices/disks/impermanence/jules/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { environment.persistence."/persist" = { hideMounts = true; @@ -8,7 +8,6 @@ "Documents" "Pictures" "Videos" - "Games" "VMs" ".snapshots" diff --git a/system/services/general/default.nix b/system/services/general/default.nix index cf3489e..4c8f377 100644 --- a/system/services/general/default.nix +++ b/system/services/general/default.nix @@ -6,7 +6,6 @@ ./libvirtd ./snowflake ./ssh - ./tlp ./userborn ]; } diff --git a/system/services/general/libvirtd/default.nix b/system/services/general/libvirtd/default.nix index 765559b..a41cd73 100644 --- a/system/services/general/libvirtd/default.nix +++ b/system/services/general/libvirtd/default.nix @@ -1,26 +1,22 @@ -{ config, lib, pkgs, ... }: +{ pkgs, ... }: { - options.system.libvirtd.enable = lib.mkEnableOption "Enable libvirtd services"; - - config = lib.mkIf config.system.libvirtd.enable { - virtualisation.libvirtd = { - enable = true; - onBoot = "ignore"; - onShutdown = "shutdown"; - qemu = { - ovmf = { - enable = true; - packages = with pkgs; [ OVMFFull.fd ]; - }; - vhostUserPackages = with pkgs; [ virtiofsd ]; - swtpm.enable = true; + virtualisation.libvirtd = { + enable = false; + onBoot = "ignore"; + onShutdown = "shutdown"; + qemu = { + ovmf = { + enable = true; + packages = with pkgs; [ OVMFFull.fd ]; }; + vhostUserPackages = with pkgs; [ virtiofsd ]; + swtpm.enable = true; }; - - # Needed to make NAT work - networking.firewall.trustedInterfaces = [ - "virbr0" - "virbr1" - ]; }; + + # Needed to make NAT work + networking.firewall.trustedInterfaces = [ + "virbr0" + "virbr1" + ]; } diff --git a/system/services/general/tlp/default.nix b/system/services/general/tlp/default.nix deleted file mode 100644 index 097e7bc..0000000 --- a/system/services/general/tlp/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: -{ - services.tlp.enable = true; -}