diff --git a/.sops.yaml b/.sops.yaml index aaf3e03..749ef4a 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -2,7 +2,6 @@ keys: - &muon age1m97a3eptxwpdd7h5kkqe9gkmhg6rquc64qjmlsfqfhfqv8q72crqrylhgc - &muho age1v4s4hg7u3vjjkarvrk7v6ev7w3wja2r5xm7f4t06culw3fuq7qns8sfju7 - &mups age1n7qz2w3hkf7fcdv92kxw9k6uef487na2tlc87486rcjwj8lyfuws5q46gn - - &murk age1mgjhkqy9x27gv2t2xvq46dxcajkr9c8zes7rr3dj0ac7md2j6vas43dftp creation_rules: - path_regex: modules/nixos/sops/secrets.ya?ml$ @@ -11,7 +10,6 @@ creation_rules: - *muon - *muho - *mups - - *murk - path_regex: modules/home/sops/secrets.ya?ml$ key_groups: @@ -19,4 +17,3 @@ creation_rules: - *muon - *muho - *mups - - *murk diff --git a/hosts/murk/configuration.nix b/hosts/murk/configuration.nix index 84c0a2f..c0748c1 100644 --- a/hosts/murk/configuration.nix +++ b/hosts/murk/configuration.nix @@ -34,26 +34,17 @@ in { mods.theme.scheme = "woodland"; mods.theme.wallpaper = ./wallpaper.png; - services.xserver.windowManager.i3.enable = true; - mods.impermanence.enable = true; - # Persist - environment.persistence."/persist" = { - directories = [ "/etc/NetworkManager" "/var/lib/NetworkManager" ]; - }; + services.xserver.windowManager.i3.enable = true; # Hardware preferences + environment.variables = { WINIT_HIDPI_FACTOR = "1"; WINIT_X11_SCALE_FACTOR = "1"; }; - ## Laptop - powerManagement.enable = true; - services.thermald.enable = true; - services.tlp.enable = true; - ## Mouse services.libinput.mouse.accelProfile = "flat"; diff --git a/hosts/murk/home.nix b/hosts/murk/home.nix index 16cbb9c..edd2dee 100644 --- a/hosts/murk/home.nix +++ b/hosts/murk/home.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, config, osConfig, inputs, ... }: +{ pkgs, lib, osConfig, inputs, ... }: let cfg = osConfig.mods; in { imports = [ inputs.impermanence.homeManagerModules.impermanence ]; @@ -6,7 +6,6 @@ in { # Modules mods.xdg.enable = true; mods.i3.enable = true; - mods.battery.enable = true; mods.terminal.zsh.enable = true; mods.terminal.emulator.enable = true; mods.terminal.development.enable = true; @@ -14,19 +13,8 @@ in { mods.desktop.development.enable = true; mods.desktop.productivity.enable = false; - home.packages = with pkgs; - [ - thunderbird - pulseaudio - pavucontrol - alsa-utils - ] - - # Non-free