From b214d9e5276fc080edf1426fbc0521bb3e461385 Mon Sep 17 00:00:00 2001 From: twoneis Date: Sun, 13 Oct 2024 14:12:12 +0200 Subject: [PATCH] remove overskride --- flake.nix | 4 --- modules/apps/default.nix | 2 -- modules/default.nix | 1 - modules/games/default.nix | 62 ++++++++++++++------------------ modules/impermanence/default.nix | 44 ----------------------- options.nix | 1 - outputs.nix | 3 +- 7 files changed, 27 insertions(+), 90 deletions(-) delete mode 100644 modules/impermanence/default.nix diff --git a/flake.nix b/flake.nix index 3c4ccdf..8ffb13c 100644 --- a/flake.nix +++ b/flake.nix @@ -27,10 +27,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - impermanence = { - url = "github:nix-community/impermanence"; - }; - lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.1"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/modules/apps/default.nix b/modules/apps/default.nix index 6077c14..ece0499 100644 --- a/modules/apps/default.nix +++ b/modules/apps/default.nix @@ -54,8 +54,6 @@ in { }; }; - home-manager.users.${conf.username}.home.packages = [ pkgs.overskride ]; - services.blueman.enable = true; }; } diff --git a/modules/default.nix b/modules/default.nix index bd66aa4..109f0d0 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -7,7 +7,6 @@ in { ./fonts ./games ./home - ./impermanence ./layout ./networking ./niri diff --git a/modules/games/default.nix b/modules/games/default.nix index 66f44b7..9fb2582 100644 --- a/modules/games/default.nix +++ b/modules/games/default.nix @@ -1,5 +1,5 @@ { lib, config, pkgs, ... }: let - inherit (lib) mkIf mkMerge; + inherit (lib) mkIf; inherit (config) conf; mkXwlWrapper = import ../niri/xwl-wrapper.nix; holo-script = pkgs.writeShellApplication { @@ -20,43 +20,33 @@ app = "${pkgs.steam}/bin/steam"; name = "Steam Wrapped"; }; -in mkIf conf.games.enable (mkMerge [ - (mkIf conf.impermanence.enable { - environment.persistence."/persist".users.${conf.username}= { - directories = [ - "Games" - ".steam" - ".local/share/PrismLauncher" - ]; - }; - }) { - programs.steam.enable = true; - programs.gamescope.enable = true; - programs.gamemode.enable = true; +in mkIf conf.games.enable { + programs.steam.enable = true; + programs.gamescope.enable = true; + programs.gamemode.enable = true; - environment.sessionVariables = { - MANGOHUD_CONFIGFILE = "$HOME/.config/MangoHud/MangoHud.conf"; - MANGOHUD_CONFIG = "read_cfg"; - }; + environment.sessionVariables = { + MANGOHUD_CONFIGFILE = "$HOME/.config/MangoHud/MangoHud.conf"; + MANGOHUD_CONFIG = "read_cfg"; + }; - home-manager.users.${conf.username} = { - home.packages = [ - pkgs.prismlauncher - pkgs.heroic - pkgs.itch - holo - steam-wrapped - ]; + home-manager.users.${conf.username} = { + home.packages = [ + pkgs.prismlauncher + pkgs.heroic + pkgs.itch + holo + steam-wrapped + ]; - programs.mangohud = { - enable = true; - settings = { - gamemode = true; - refresh_rate = true; - fsr = true; - resolution = true; - }; + programs.mangohud = { + enable = true; + settings = { + gamemode = true; + refresh_rate = true; + fsr = true; + resolution = true; }; }; - } -]) + }; +} diff --git a/modules/impermanence/default.nix b/modules/impermanence/default.nix deleted file mode 100644 index c9bb669..0000000 --- a/modules/impermanence/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, config, ... }: let - inherit (lib) mkIf; - inherit (config) conf; -in mkIf conf.impermanence.enable { - environment.persistence."/persist" = { - enable = true; - directories = [ - "/var/log" - "/var/lib/bluetooth" - "/var/lib/nixos" - "/var/lib/iwd" - "/etc/secureboot" - ]; - files = [ - "/etc/machine-id" - "/etc/passwd" - "/etc/shadow" - ]; - - users.${conf.username}= { - directories = [ - "Documents" - "Pictures" - "Videos" - "code" - { directory = ".local/share/keyrings"; mode = "0700"; } - ".local/share/direnv" - ]; - }; - }; - - boot.initrd = { - enable = true; - supportedFilesystems = [ "btrfs" ]; - - systemd.services.restore-boot = { - description = "Rollback btrfs rootfs"; - WantedBy = [ "initrd.target" ]; - requires = [ - - ]; - }; - }; -} diff --git a/options.nix b/options.nix index 470caa4..418ec16 100644 --- a/options.nix +++ b/options.nix @@ -9,7 +9,6 @@ in { vm.enable = mkEnableOption "Enable VM related configuration."; containers.enable = mkEnableOption "Enable container support."; games.enable = mkEnableOption "Enable games."; - impermanence.enable = mkEnableOption "Use impermanence module."; secureboot.enable = mkEnableOption "Enable secure boot utilities (manual key-enrolling required)."; extraLayout.enable = mkEnableOption "Enable additional custom layout."; diff --git a/outputs.nix b/outputs.nix index 5ab6ba4..6600e5c 100644 --- a/outputs.nix +++ b/outputs.nix @@ -1,11 +1,10 @@ -{ nixpkgs, lix, home-manager, nixos-hardware, niri, impermanence, lanzaboote, ... }@inputs: let +{ nixpkgs, lix, home-manager, nixos-hardware, niri, lanzaboote, ... }@inputs: let modules = [ ./modules ./options.nix niri.nixosModules.niri home-manager.nixosModules.home-manager lix.nixosModules.default - impermanence.nixosModules.impermanence lanzaboote.nixosModules.lanzaboote ]; in {