diff --git a/home.nix b/home.nix index 64a770a..2af0097 100644 --- a/home.nix +++ b/home.nix @@ -28,7 +28,6 @@ git neovide (nerdfonts.override { fonts = [ "Iosevka" ]; }) - mpv obsidian powertop qutebrowser @@ -119,9 +118,6 @@ enable = true; nix-direnv.enable = true; }; - firefox = { - enable = true; - }; fish = { enable = true; loginShellInit = '' @@ -385,20 +381,6 @@ playerctld.enable = true; swayidle = { enable = true; - events = [ - { event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock -fF"; } - ]; - timeouts = [ - { - timeout = 300; - command = "${pkgs.swaylock}/bin/swaylock -fF"; - } - { - timeout = 330; - command = "${pkgs.sway}/bin/swaymsg 'output * dpms off'"; - resumeCommand = "${pkgs.sway}/bin/swaymsg 'output * dpms on'"; - } - ]; }; syncthing = { enable = true; @@ -426,10 +408,6 @@ enable = true; config = { gaps = { - inner = 50; - vertical = 100; - horizontal = 600; - smartGaps = true; smartBorders = "on"; }; input = { @@ -458,20 +436,6 @@ "XF86AudioPrev" = "exec playerctl previous"; }; modifier = "Mod4"; - output = { - DP-1 = { - resolution = "3840x2160@30Hz"; - position = "1920 0"; - # background = "/home/muhh/Sync/Backgrounds/wald.jpg fill"; - scale = "1.0"; - }; - HDMI-A-1 = { - resolution = "1920x1080@60.000Hz"; - transform = "180"; - position = "0 0"; - # background = "/home/muhh/Sync/Backgrounds/pfuetze.jpg fill"; - }; - }; seat = { "*" = { hide_cursor = "5000"; diff --git a/hosts/cube-hardware-configuration.nix b/hosts/cube-hardware-configuration.nix index cbacf92..b50cd6d 100644 --- a/hosts/cube-hardware-configuration.nix +++ b/hosts/cube-hardware-configuration.nix @@ -23,16 +23,6 @@ fsType = "vfat"; }; - fileSystems."/storage/family" = - { device = "/dev/disk/by-uuid/896c11dc-d275-4992-99e6-fddc394a7bf1"; - fsType = "xfs"; - }; - - fileSystems."/storage/muhh" = - { device = "/dev/disk/by-uuid/8b716713-359b-4bac-8951-a35405dccd4c"; - fsType = "xfs"; - }; - swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking diff --git a/hosts/cube.nix b/hosts/cube.nix index 22b30c4..438d8bc 100644 --- a/hosts/cube.nix +++ b/hosts/cube.nix @@ -51,13 +51,9 @@ LC_TIME = "de_DE.UTF-8"; }; - security = { - rtkit.enable = true; - pam.services.swaylock = {}; - }; services.flatpak.enable = true; services.fwupd.enable = true; - services.openssh.enable = true; + security.rtkit.enable = true; services.pipewire = { enable = true; alsa.enable = true; @@ -66,17 +62,8 @@ # If you want to use JACK applications, uncomment this #jack.enable = true; }; - services.plex = { - enable = true; - dataDir = "/var/lib/plex"; - openFirewall = true; - user = "plex"; - group = "plex"; - }; - services.tailscale = { enable = true; - authKeyFile = config.sops.secrets.tailscale_auth_key.path; }; # Configure keymap in X11 @@ -85,9 +72,7 @@ xkb.options = "compose:ralt"; }; - sops.defaultSopsFile = ../secrets/secrets.yaml; - sops.age.keyFile = "/home/muhh/.config/sops/age/keys.txt"; - sops.secrets.tailscale_auth_key = {}; + # sops.defaultSopsFile = "/home/muhh/nix-config/secrets/secrets.yaml"; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.muhh = { isNormalUser = true; diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index 55bb63e..5d3e946 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,5 +1,4 @@ just_a_test: ENC[AES256_GCM,data:HDhSG6BejOadBaeW,iv:idSJWRevqi4h/gaTREOt5tGfamRcxSUSmaelgyZUmu0=,tag:jo5lugFHpdjGeo/RtN86DA==,type:str] -tailscale_auth_key: ENC[AES256_GCM,data:1zT4rp8bxLLllmSPzC/n+Kg4m//zVynXdX8JnyO5G6mHdUrl46yYuWeyx4HNSRJmBicjVCvLMSnNeVMktg==,iv:cyInU7JNrTAnYtgF5e9jt+WKvNrumaWmRofr7++JQWA=,tag:ztKvGc1t8qeFKMbSbaq5Tw==,type:str] mail: privat: address: ENC[AES256_GCM,data:MdODBjT/vGmoZidXYppWX0EN,iv:Ai2YVodb/vOEyCK2spnH1vwPJrdvqIHM40ZGhALHq8A=,tag:ge1dIDEgiSYVJGNwuq+qKw==,type:str] @@ -33,8 +32,8 @@ sops: SEFxb2UwbDFiSG5QdzVWRk02b3lIZDQKYF4Vv3FwvKv3uwACRXb/jwD6Q5rh39Yu w7J86gsX7Yh9Wm65y+CW1JE8EN72mhBbYwve3lK8twDjxmLhYOMjIg== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-05-19T16:46:00Z" - mac: ENC[AES256_GCM,data:xEOM5qqtGEeCmOi+z+MdZ3h4jLjj9aLn6EFGmvHkLsZCG4DWCc7KTaSOTyTVRnpsL/Nsuhqj88QNaM+ekBPA3120C64IKM6J/ZEfOriLfrmL8uzwMXPPqTMkCDs3ALNNontMl/zUL0LYGJ5bcraIQr0DBaup0DuRD5zcGVjUUCs=,iv:2/WrjzoKNCTfwogz0ITC+FeSg/gPCTTR1s+OtIJ3Esc=,tag:flAkHZ9+jIsEsQXChCc0vQ==,type:str] + lastmodified: "2024-04-11T15:20:09Z" + mac: ENC[AES256_GCM,data:k6sIben6qmbR4vdHKjbPXfbycAoJC4nDwkb5c8EF1tBCyPM294XUK9DJ8MrEtijB7snp6q5hbFOxeYm4saTdUCmIA0OJi09Gto+mKbPn4oUWu1IGOqphe+71JBsdC5VK0X7C/6AskMpGHTjVFzEMSCNG1QlWwqjbj+nooMxT5X4=,iv:Mw3mrFx/CAmuCplqVcXiUDBEeb0bqK0Y4kTCZxMise8=,tag:seTx8hAi/8oGRCwpv9Qdug==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.8.1