diff --git a/home-manager.nix b/home-manager.nix index cdfbe530..48a85899 100644 --- a/home-manager.nix +++ b/home-manager.nix @@ -6,9 +6,7 @@ useUserPackages = true; extraSpecialArgs = { inherit inputs; }; backupFileExtension = "hm-backup"; - users = { - functionalhacker = import ./users/functionalhacker/home.nix; - som = import ./users/som/home.nix; - }; + users.functionalhacker = + import ./users/functionalhacker/home.nix; }; } diff --git a/users/functionalhacker/home.nix b/users/functionalhacker/home.nix index 216ea088..ca944cbc 100644 --- a/users/functionalhacker/home.nix +++ b/users/functionalhacker/home.nix @@ -2,19 +2,7 @@ { imports = [ - ./bat.nix - ./eza.nix - ./firefox.nix - ./fzf.nix - ./git.nix - ./gnome.nix - ./gpg.nix - ./neovim.nix - ./pass.nix - ./ripgrep.nix - ./ssh.nix - ./zellij.nix - ./zsh.nix + ./programs/default.nix ]; home = { diff --git a/users/functionalhacker/programs/default.nix b/users/functionalhacker/programs/default.nix new file mode 100644 index 00000000..2bb46dd4 --- /dev/null +++ b/users/functionalhacker/programs/default.nix @@ -0,0 +1,19 @@ +{ ... }: + +{ + imports = [ + ./bat.nix + ./eza.nix + ./firefox.nix + ./fzf.nix + ./git.nix + ./gnome.nix + ./gpg.nix + ./neovim.nix + ./pass.nix + ./ripgrep.nix + ./ssh.nix + ./zellij.nix + ./zsh.nix + ]; +} diff --git a/users/som/home.nix b/users/som/home.nix deleted file mode 100644 index 4ae3217d..00000000 --- a/users/som/home.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: - -{ - imports = [ - ./programs/gnome.nix - ]; - - home = { - username = "som"; - homeDirectory = "/home/som"; - stateVersion = "24.05"; - }; -} diff --git a/users/som/programs/gnome.nix b/users/som/programs/gnome.nix deleted file mode 100644 index cb0505b5..00000000 --- a/users/som/programs/gnome.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ lib, pkgs, ... }: - -with lib.hm.gvariant; - -{ - home.packages = with pkgs.gnomeExtensions; [ - gsconnect - night-theme-switcher - appindicator - ]; - - dconf.settings = { - "org/gnome/shell" = { - disable-user-extensions = false; - - enabled-extensions = [ - "gsconnect@andyholmes.github.io" - "nightthemeswitcher@romainvigier.fr" - "appindicatorsupport@rgcjonas.gmail.com" - ]; - - favorite-apps = [ - "firefox.desktop" - "org.gnome.Nautilus.desktop" - "org.telegram.desktop.desktop" - ]; - }; - - "org/gnome/shell/extensions/nightthemeswitcher/time" = { - manual-schedule = true; - nightthemeswitcher-ondemand-keybinding = [ "t" ]; - sunrise = 8.0; - sunset = 18.0; - }; - - "org/gnome/desktop/a11y/mouse" = { - dwell-click-enabled = false; - dwell-threshold = 10; - dwell-time = 1.2; - secondary-click-enabled = true; - secondary-click-time = 1.2; - }; - - "org/gnome/desktop/calendar" = { - show-weekdate = true; - }; - - "org/gnome/desktop/input-sources" = { - show-all-sources = true; - sources = [ - (mkTuple [ "xkb" "eu" ]) - (mkTuple [ "xkb" "th" ]) - ]; - xkb-options = [ "lv3:ralt_switch" ]; - }; - - "org/gnome/desktop/peripherals/touchpad" = { - tap-to-click = true; - two-finger-scrolling-enabled = true; - }; - - "org/gnome/desktop/privacy" = { - disable-microphone = false; - old-files-age = mkUint32 14; - recent-files-max-age = -1; - remove-old-temp-files = true; - remove-old-trash-files = true; - }; - - "org/gnome/system/location" = { - enabled = true; - }; - }; -}