diff --git a/.github/README.md b/.github/README.md index d131aa4d..57e402fd 100644 --- a/.github/README.md +++ b/.github/README.md @@ -35,6 +35,7 @@

## Notable features + - 🔒 Luks disk encryption with btrfs - 🤫 Opt-in impermanence - 🟢 Fully functional Wayland + Nvidia setup @@ -56,7 +57,6 @@ - [io](hosts/io) 💻 Configs for my future framework laptop ([currently im kinda broke](https://en.liberapay.com/sioodmy/)) [🚧] - [pkgs](pkgs) 💿 exported packages - ## 💛 Donate If you would like to support me you can sponsor me via ko-fi diff --git a/flake.lock b/flake.lock index 8fdc64eb..2410f06a 100644 --- a/flake.lock +++ b/flake.lock @@ -25,35 +25,9 @@ "type": "github" } }, - "barbie": { - "inputs": { - "crane": "crane", - "fenix": "fenix", - "flake-parts": [ - "flake-parts" - ], - "home-manager": "home-manager", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1706738102, - "narHash": "sha256-F9Fvdq2dyAQgwfob0cnpGOTturluQ+mAz0VtvCrrHhI=", - "owner": "sioodmy", - "repo": "barbie", - "rev": "667e3d812dcf473705024ac4995707598e99ae1c", - "type": "github" - }, - "original": { - "owner": "sioodmy", - "repo": "barbie", - "type": "github" - } - }, "catppuccinifier": { "inputs": { - "crane": "crane_2", + "crane": "crane", "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" @@ -74,27 +48,6 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "barbie", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1702488130, - "narHash": "sha256-Bz4KTuBARAQY8952CpmYVD9o/LoScYjdw8KrK2OjEoA=", - "owner": "ipetkov", - "repo": "crane", - "rev": "33dbb6a8342e1cf6252c8976d02ff8a7632aa071", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", @@ -118,7 +71,7 @@ "type": "github" } }, - "crane_3": { + "crane_2": { "inputs": { "nixpkgs": [ "niri", @@ -139,7 +92,7 @@ "type": "github" } }, - "crane_4": { + "crane_3": { "inputs": { "nixpkgs": [ "schizofox", @@ -205,34 +158,12 @@ } }, "fenix": { - "inputs": { - "nixpkgs": [ - "barbie", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1702448575, - "narHash": "sha256-Gm8lI5vumDEryeUI+bT8w0AIvbolZIGh0F/E0mQSLcw=", - "owner": "nix-community", - "repo": "fenix", - "rev": "dcf3ca909bd069e6a5737461b64c8d894c6dee85", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, - "fenix_2": { "inputs": { "nixpkgs": [ "niri", "nixpkgs" ], - "rust-analyzer-src": "rust-analyzer-src_2" + "rust-analyzer-src": "rust-analyzer-src" }, "locked": { "lastModified": 1709274179, @@ -493,27 +424,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "barbie", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1702538064, - "narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "0e2e443ff24f9d75925e91b89d1da44b863734af", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -533,7 +443,7 @@ "type": "github" } }, - "home-manager_3": { + "home-manager_2": { "inputs": { "nixpkgs": [ "schizofox", @@ -679,8 +589,8 @@ }, "niri": { "inputs": { - "crane": "crane_3", - "fenix": "fenix_2", + "crane": "crane_2", + "fenix": "fenix", "flake-utils": "flake-utils_4", "nix-filter": "nix-filter", "nixpkgs": [ @@ -850,11 +760,10 @@ "root": { "inputs": { "agenix": "agenix", - "barbie": "barbie", "catppuccinifier": "catppuccinifier", "devshell": "devshell", "flake-parts": "flake-parts", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "hypridle": "hypridle", "hyprlock": "hyprlock", "hyprpicker": "hyprpicker", @@ -866,29 +775,11 @@ "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "schizofox": "schizofox", - "schizosearch": "schizosearch", "sioodmy-dev": "sioodmy-dev", "treefmt-nix": "treefmt-nix" } }, "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1702418101, - "narHash": "sha256-XyrXFAiMS5r9Kl4lPpmkTTclPKGwJBxln6enERe5nvk=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "b3af1916ccfb85233571ce9ecb45a3a7c74ba0fb", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, - "rust-analyzer-src_2": { "flake": false, "locked": { "lastModified": 1709219524, @@ -938,7 +829,7 @@ "flake-parts": [ "flake-parts" ], - "home-manager": "home-manager_3", + "home-manager": "home-manager_2", "nixpak": [ "nixpak" ], @@ -962,35 +853,9 @@ "type": "github" } }, - "schizosearch": { - "inputs": { - "flake-parts": [ - "flake-parts" - ], - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": [ - "treefmt-nix" - ] - }, - "locked": { - "lastModified": 1714333517, - "narHash": "sha256-BKapyYQobnjpfFLcIyzXx3yckTr2rrgAcQHaxoOS188=", - "owner": "sioodmy", - "repo": "schizosearch", - "rev": "3261e2c0ea3a112dcfd9346cfe385bb16df96e13", - "type": "github" - }, - "original": { - "owner": "sioodmy", - "repo": "schizosearch", - "type": "github" - } - }, "searx-randomizer": { "inputs": { - "crane": "crane_4", + "crane": "crane_3", "flake-parts": "flake-parts_3", "nixpkgs": [ "schizofox", diff --git a/flake.nix b/flake.nix index 54620af2..2f2f359c 100644 --- a/flake.nix +++ b/flake.nix @@ -130,14 +130,6 @@ flake-parts.follows = "flake-parts"; }; }; - schizosearch = { - url = "github:sioodmy/schizosearch"; - inputs = { - nixpkgs.follows = "nixpkgs"; - flake-parts.follows = "flake-parts"; - treefmt-nix.follows = "treefmt-nix"; - }; - }; # a tree-wide formatter treefmt-nix = { diff --git a/home/default.nix b/home/default.nix index d048fbf1..0595e8fc 100644 --- a/home/default.nix +++ b/home/default.nix @@ -9,7 +9,6 @@ config.home.extraOutputsToInstall = ["doc" "devdoc"]; imports = [ inputs.nix-index-db.hmModules.nix-index - inputs.barbie.homeManagerModule inputs.schizofox.homeManagerModule inputs.impermanence.nixosModules.home-manager.impermanence inputs.hyprlock.homeManagerModules.default diff --git a/home/rice/niri/config.nix b/home/rice/niri/config.nix index a83795c4..12eb7f7c 100644 --- a/home/rice/niri/config.nix +++ b/home/rice/niri/config.nix @@ -15,7 +15,7 @@ with theme.colors; '' natural-scroll click-method "clickfinger" } - + trackpoint { accel-speed 0.001 } diff --git a/hosts/default.nix b/hosts/default.nix index 82b24cae..e5579b2b 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -7,7 +7,6 @@ core = ../system/core; bootloader = ../system/core/bootloader.nix; impermanence = ../system/core/impermanence.nix; - nvidia = ../system/nvidia; server = ../system/server; wayland = ../system/wayland; hw = inputs.nixos-hardware.nixosModules; @@ -32,24 +31,6 @@ in { # all my hosts are named after saturn moons btw - # desktop - anthe = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = - [ - {networking.hostName = "anthe";} - ./anthe - nvidia - bootloader - impermanence - wayland - hmModule - {inherit home-manager;} - ] - ++ shared; - specialArgs = {inherit inputs;}; - }; - # thinkpad calypso = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -90,8 +71,6 @@ in { [ {networking.hostName = "iapetus";} hw.raspberry-pi-4 - server - inputs.schizosearch.nixosModules.default ./iapetus ] ++ shared; diff --git a/system/core/nix.nix b/system/core/nix.nix index a146c88d..8bd40b62 100644 --- a/system/core/nix.nix +++ b/system/core/nix.nix @@ -38,15 +38,6 @@ "electron-25.9.0" ]; - allowUnfreePredicate = - lib.mkIf cfg.networking.hostName - == "anthe" ( - pkg: - builtins.elem (lib.getName pkg) [ - "nvidia-x11" - "nvidia-settings" - ] - ); overlays = [ # workaround for: https://github.com/NixOS/nixpkgs/issues/154163 (_: super: { diff --git a/system/nvidia/default.nix b/system/nvidia/default.nix deleted file mode 100644 index b765850f..00000000 --- a/system/nvidia/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{pkgs, ...}: { - services.xserver.videoDrivers = ["nvidia"]; - - environment.variables = { - GBM_BACKEND = "nvidia-drm"; - WLR_NO_HARDWARE_CURSORS = "1"; - LIBVA_DRIVER_NAME = "nvidia"; - __GLX_VENDOR_LIBRARY_NAME = "nvidia"; - }; - - environment.systemPackages = with pkgs; [ - vulkan-loader - vulkan-validation-layers - vulkan-tools - ]; - - hardware = { - nvidia = { - open = true; - powerManagement.enable = true; - modesetting.enable = true; - }; - opengl.extraPackages = with pkgs; [nvidia-vaapi-driver]; - }; -} diff --git a/system/server/default.nix b/system/server/default.nix index 1016a3c2..cc81a1cc 100644 --- a/system/server/default.nix +++ b/system/server/default.nix @@ -5,7 +5,6 @@ }: # TODO { - imports = [inputs.schizosearch.nixosModules.default]; services.nginx = { enable = true; # package = pkgs.nginx.override {openssl = pkgs.libressl;}; @@ -32,18 +31,11 @@ }; }; - services.schizosearch.enable = true; security.acme = { acceptTerms = true; defaults.email = "hello@sioodmy.dev"; }; - # services.schizosearch = { - # enable = true; - # openFirewall = true; - # settings.port = 3000; - # }; - networking.firewall = { allowedUDPPorts = [51820 5232]; allowedTCPPorts = [5232 80 3000];