remove overskride

This commit is contained in:
twoneis 2024-10-13 14:12:12 +02:00
parent 3fd39b26ca
commit b214d9e527
7 changed files with 27 additions and 90 deletions

View file

@ -27,10 +27,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
impermanence = {
url = "github:nix-community/impermanence";
};
lanzaboote = { lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.1"; url = "github:nix-community/lanzaboote/v0.4.1";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -54,8 +54,6 @@ in {
}; };
}; };
home-manager.users.${conf.username}.home.packages = [ pkgs.overskride ];
services.blueman.enable = true; services.blueman.enable = true;
}; };
} }

View file

@ -7,7 +7,6 @@ in {
./fonts ./fonts
./games ./games
./home ./home
./impermanence
./layout ./layout
./networking ./networking
./niri ./niri

View file

@ -1,5 +1,5 @@
{ lib, config, pkgs, ... }: let { lib, config, pkgs, ... }: let
inherit (lib) mkIf mkMerge; inherit (lib) mkIf;
inherit (config) conf; inherit (config) conf;
mkXwlWrapper = import ../niri/xwl-wrapper.nix; mkXwlWrapper = import ../niri/xwl-wrapper.nix;
holo-script = pkgs.writeShellApplication { holo-script = pkgs.writeShellApplication {
@ -20,16 +20,7 @@
app = "${pkgs.steam}/bin/steam"; app = "${pkgs.steam}/bin/steam";
name = "Steam Wrapped"; name = "Steam Wrapped";
}; };
in mkIf conf.games.enable (mkMerge [ in mkIf conf.games.enable {
(mkIf conf.impermanence.enable {
environment.persistence."/persist".users.${conf.username}= {
directories = [
"Games"
".steam"
".local/share/PrismLauncher"
];
};
}) {
programs.steam.enable = true; programs.steam.enable = true;
programs.gamescope.enable = true; programs.gamescope.enable = true;
programs.gamemode.enable = true; programs.gamemode.enable = true;
@ -59,4 +50,3 @@ in mkIf conf.games.enable (mkMerge [
}; };
}; };
} }
])

View file

@ -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 = [
];
};
};
}

View file

@ -9,7 +9,6 @@ in {
vm.enable = mkEnableOption "Enable VM related configuration."; vm.enable = mkEnableOption "Enable VM related configuration.";
containers.enable = mkEnableOption "Enable container support."; containers.enable = mkEnableOption "Enable container support.";
games.enable = mkEnableOption "Enable games."; games.enable = mkEnableOption "Enable games.";
impermanence.enable = mkEnableOption "Use impermanence module.";
secureboot.enable = mkEnableOption "Enable secure boot utilities (manual key-enrolling required)."; secureboot.enable = mkEnableOption "Enable secure boot utilities (manual key-enrolling required).";
extraLayout.enable = mkEnableOption "Enable additional custom layout."; extraLayout.enable = mkEnableOption "Enable additional custom layout.";

View file

@ -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 = [
./modules ./modules
./options.nix ./options.nix
niri.nixosModules.niri niri.nixosModules.niri
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
lix.nixosModules.default lix.nixosModules.default
impermanence.nixosModules.impermanence
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
]; ];
in { in {