stuff

common/avahi.nix

@@ -1,15 +0,0 @@
-{
-  services.avahi = {
-    enable = true;
-    nssmdns4 = true;
-    nssmdns6 = true;
-    publish = {
-      enable = true;
-      addresses = true;
-      domain = true;
-      hinfo = true;
-      userServices = true;
-      workstation = true;
-    };
-  };
-}

common/bash.nix

@@ -1,5 +1,5 @@
 {
-  programs.bash. interactiveShellInit = ''
+  programs.bash.interactiveShellInit = ''
     shopt -s autocd globstar failglob extglob checkwinsize
   '';
 }

common/default.nix

@@ -1,22 +1,21 @@
 {
   imports = [
     ./bash.nix
-    ./cnf.nix
-    ./fish.nix
     ./boot.nix
     ./bottom.nix
+    ./cnf.nix
     ./dbus.nix
     ./direnv.nix
     ./fs.nix
     ./fwupd.nix
     ./git.nix
-    ./neovim.nix
     ./nix.nix
     ./readline.nix
     ./ssh.nix
     ./starship.nix
     ./sudo.nix
     ./swap.nix
+    ./time.nix
     ./users.nix
   ];
 }

common/fish.nix

@@ -1,15 +0,0 @@
-{pkgs, ...}: {
-  programs.fish.enable = true;
-
-  users.defaultUserShell = pkgs.fish;
-
-  nixpkgs.overlays = [
-    (final: prev: {
-      fish = prev.fish.overrideAttrs (_: {
-        postInstall = ''
-          rm $out/share/applications/fish.desktop
-        '';
-      });
-    })
-  ];
-}

common/fs.nix

@@ -4,6 +4,7 @@
   fileSystems = {
     "/" = {
       fsType = "ext4";
+      label = "main";
       options = ["noatime"];
     };
     "/boot" = {

common/neovim.nix

@@ -1,17 +0,0 @@
-{
-  inputs,
-  lib,
-  pkgs,
-  ...
-}: {
-  environment = let
-    package = inputs.myvim.packages.${pkgs.system}.default.overrideAttrs (oldAttrs: {
-      postInstall = ''
-        rm $out/share/applications/nvim.desktop
-      '';
-    });
-  in {
-    systemPackages = [package];
-    variables = lib.genAttrs ["EDITOR" "VISUAL"] (_: lib.getExe package);
-  };
-}

common/readline.nix

@@ -12,6 +12,7 @@
     Control-a: beginning-of-line
     Tab: menu-complete
     "\e[Z": complete
+
     set keymap vi-insert
     Control-l: clear-screen
     Control-a: beginning-of-line

common/time.nix

@@ -0,0 +1,3 @@
+{
+  time.timeZone = "UTC";
+}

common/users.nix

@@ -2,6 +2,8 @@
   age.secrets.user-lukas.file = ../secrets/user-lukas.age;
 
   users = {
+    mutableUsers = false;
+
     groups.lukas.gid = 1000;
 
     users = {

common/zellij.nix

@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = [pkgs.zellij];
-}