diff --git a/home/natto/config/README b/home/natto/config/README new file mode 100644 index 0000000..b08d378 --- /dev/null +++ b/home/natto/config/README @@ -0,0 +1 @@ +Some of these are copied as-it-is. The rest are managed via home-manager and are just here for legacy purposes. diff --git a/home/natto/config/dunst/dunstrc b/home/natto/config/dunst/dunstrc new file mode 100644 index 0000000..1a14d9b --- /dev/null +++ b/home/natto/config/dunst/dunstrc @@ -0,0 +1,27 @@ +[global] +font="Monospace 10" +icon_path="/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/actions:/run/current-system/sw/share/icons/hicolor/32x32/actions:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/animations:/run/current-system/sw/share/icons/hicolor/32x32/animations:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/apps:/run/current-system/sw/share/icons/hicolor/32x32/apps:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/categories:/run/current-system/sw/share/icons/hicolor/32x32/categories:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/devices:/run/current-system/sw/share/icons/hicolor/32x32/devices:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/emblems:/run/current-system/sw/share/icons/hicolor/32x32/emblems:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/emotes:/run/current-system/sw/share/icons/hicolor/32x32/emotes:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/filesystem:/run/current-system/sw/share/icons/hicolor/32x32/filesystem:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/intl:/run/current-system/sw/share/icons/hicolor/32x32/intl:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/legacy:/run/current-system/sw/share/icons/hicolor/32x32/legacy:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/mimetypes:/run/current-system/sw/share/icons/hicolor/32x32/mimetypes:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/places:/run/current-system/sw/share/icons/hicolor/32x32/places:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/status:/run/current-system/sw/share/icons/hicolor/32x32/status:/run/current-system/sw/share/icons/Zafiro-icons-Dark/32x32/stock:/run/current-system/sw/share/icons/hicolor/32x32/stock:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/actions:/home/natto/.nix-profile/share/icons/hicolor/32x32/actions:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/animations:/home/natto/.nix-profile/share/icons/hicolor/32x32/animations:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/apps:/home/natto/.nix-profile/share/icons/hicolor/32x32/apps:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/categories:/home/natto/.nix-profile/share/icons/hicolor/32x32/categories:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/devices:/home/natto/.nix-profile/share/icons/hicolor/32x32/devices:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/emblems:/home/natto/.nix-profile/share/icons/hicolor/32x32/emblems:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/emotes:/home/natto/.nix-profile/share/icons/hicolor/32x32/emotes:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/filesystem:/home/natto/.nix-profile/share/icons/hicolor/32x32/filesystem:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/intl:/home/natto/.nix-profile/share/icons/hicolor/32x32/intl:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/legacy:/home/natto/.nix-profile/share/icons/hicolor/32x32/legacy:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/mimetypes:/home/natto/.nix-profile/share/icons/hicolor/32x32/mimetypes:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/places:/home/natto/.nix-profile/share/icons/hicolor/32x32/places:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/status:/home/natto/.nix-profile/share/icons/hicolor/32x32/status:/home/natto/.nix-profile/share/icons/Zafiro-icons-Dark/32x32/stock:/home/natto/.nix-profile/share/icons/hicolor/32x32/stock:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/actions:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/actions:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/animations:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/animations:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/apps:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/apps:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/categories:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/categories:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/devices:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/devices:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/emblems:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/emblems:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/emotes:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/emotes:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/filesystem:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/filesystem:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/intl:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/intl:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/legacy:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/legacy:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/mimetypes:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/mimetypes:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/places:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/places:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/status:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/status:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/Zafiro-icons-Dark/32x32/stock:/nix/store/3j4kvbilmm7wsgsfi5lgw01xa15c22fj-zafiro-icons-1.3/share/icons/hicolor/32x32/stock:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/actions:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/actions:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/animations:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/animations:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/apps:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/apps:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/categories:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/categories:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/devices:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/devices:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/emblems:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/emblems:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/emotes:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/emotes:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/filesystem:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/filesystem:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/intl:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/intl:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/legacy:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/legacy:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/mimetypes:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/mimetypes:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/places:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/places:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/status:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/status:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/Zafiro-icons-Dark/32x32/stock:/nix/store/sf86wxsy576isj364bwmwrym25cah7dd-hicolor-icon-theme-0.17/share/icons/hicolor/32x32/stock" +mouse_left_click="close_current" +mouse_middle_click="close_all" +mouse_right_click="do_action" +separator_color="auto" +shrink=yes +word_wrap="yes" + +[urgency_critical] +background="#11111B" +foreground="#CDD6F4" +frame_color="#F38BA8" +timeout=0 + +[urgency_low] +background="#11111B" +foreground="#CDD6F4" +frame_color="#89DCEB" +timeout=5 + +[urgency_normal] +background="#11111B" +foreground="#CDD6F4" +frame_color="#A6E3A1" +timeout=5 diff --git a/home/natto/default.nix b/home/natto/default.nix index 36a8257..fbb2aba 100644 --- a/home/natto/default.nix +++ b/home/natto/default.nix @@ -8,13 +8,15 @@ imports = [ ./email.nix - ./secrets ./programs.nix ./xsession.nix ./wayland.nix - ./services.nix ./pkgs.nix ./stuff.nix ./emacs.nix + ./dunst.nix + ./git.nix + ./mpd.nix + ./zsh.nix ]; } diff --git a/home/natto/dunst.nix b/home/natto/dunst.nix new file mode 100644 index 0000000..3f9a022 --- /dev/null +++ b/home/natto/dunst.nix @@ -0,0 +1,38 @@ +{ config, colors, ... }: +{ + services = { + dunst = { + enable = true; + iconTheme = with config.gtk.iconTheme; { inherit name package; }; + settings = with colors.hex; { + global = { + mouse_left_click = "close_current"; + mouse_right_click = "do_action"; + mouse_middle_click = "close_all"; + font = "Monospace 10"; + separator_color = "auto"; + shrink = true; + word_wrap = "yes"; + }; + + urgency_low = { + inherit background foreground; + frame_color = sky; + timeout = 5; + }; + + urgency_normal = { + inherit background foreground; + frame_color = green; + timeout = 5; + }; + + urgency_critical = { + inherit background foreground; + frame_color = red; + timeout = 0; + }; + }; + }; + }; +} diff --git a/home/natto/git.nix b/home/natto/git.nix new file mode 100644 index 0000000..6b38e63 --- /dev/null +++ b/home/natto/git.nix @@ -0,0 +1,16 @@ +{ config, pkgs, ... }: +{ + programs.git = { + enable = true; + package = pkgs.git.override { + doInstallCheck = false; + sendEmailSupport = true; + withManual = false; + }; + }; + + age.secrets.gitconfig = { + file = ./secrets/.gitconfig.age; + path = "${config.home.homeDirectory}/.gitconfig"; + }; +} diff --git a/home/natto/services.nix b/home/natto/mpd.nix similarity index 54% rename from home/natto/services.nix rename to home/natto/mpd.nix index e44be6d..f0434eb 100644 --- a/home/natto/services.nix +++ b/home/natto/mpd.nix @@ -1,11 +1,14 @@ -{ config, pkgs, inputs, ... }: +{ config, pkgs, ... }: +let + home = config.home.homeDirectory; +in { services = { mpd = { enable = true; - musicDirectory = "${config.home.homeDirectory}/Music"; - dbFile = "${config.home.homeDirectory}/.config/mpd/database"; - dataDir = "${config.home.homeDirectory}/.config/mpd"; + musicDirectory = "${home}/Music"; + dbFile = "${home}/.config/mpd/database"; + dataDir = "${home}/.config/mpd"; network = { startWhenNeeded = true; listenAddress = "any"; @@ -26,38 +29,6 @@ }; }; }; - - dunst = { - enable = true; - settings = { - global = { - font = "Monospace 10"; - frame_color = "#93a1a1"; - separator_color = "#93a1a1"; - shrink = true; - icon_theme = config.gtk.iconTheme.name; - }; - - urgency_low = { - background = "#586e75"; - foreground = "#eee8d5"; - timeout = 5; - }; - - urgency_normal = { - background = "#073642"; - foreground = "#eee8d5"; - timeout = 5; - }; - - urgency_critical = { - background = "#dc322f"; - foreground = "#eee8d5"; - timeout = 0; - }; - }; - }; - }; systemd.user.services = { @@ -84,4 +55,25 @@ }; }; }; + + home = { + packages = with pkgs; [ + (ncmpcpp.override { + visualizerSupport = true; + clockSupport = true; + }) + mpdas + mpc_cli + ]; + + file.ncmpcpp = { + source = ./config/ncmpcpp/config; + target = "${config.xdg.configHome}/ncmpcpp/config"; + }; + }; + + age.secrets.mpdasrc = { + file = ./secrets/mpdasrc.age; + path = "${home}/.config/mpdasrc"; + }; } diff --git a/home/natto/pkgs.nix b/home/natto/pkgs.nix index 56a7126..68d813a 100644 --- a/home/natto/pkgs.nix +++ b/home/natto/pkgs.nix @@ -4,10 +4,8 @@ # A/V, codec and media stuff ffmpeg-full - pamixer - mpdas + wireplumber mpv - mpc_cli pulseaudio pavucontrol spotify @@ -16,22 +14,12 @@ # Utils rage curl - (dmenu.override { patches = [ ./patches/dmenu.patch ]; }) - (st.override { - patches = [ ./patches/st.patch ]; - extraLibs = [ harfbuzz ]; - }) yt-dlp - xclip - xorg.xkbcomp - xorg.xmodmap p7zip unrar - sxiv vim jmtpfs neofetch - xdotool (inputs.nbfc.packages.${pkgs.system}.nbfc-client-c) (flake.packages.${pkgs.system}.customscripts) translate-shell @@ -40,16 +28,6 @@ undervolt # GUI utils - (xfce.thunar.override { - thunarPlugins = with xfce; [ - thunar-media-tags-plugin - thunar-volman - thunar-archive-plugin - ]; - }) - xfce.xfconf - xfce.tumbler - flameshot (discord.override { nss = nss_latest; }) @@ -58,12 +36,8 @@ luajit dunst feh - xmobar - arc-theme - arc-icon-theme authy gnome.zenity - stalonetray # Wine and games and stuff steam @@ -108,10 +82,5 @@ anki-bin tor-browser-bundle-bin mailcap - (ncmpcpp.override { - visualizerSupport = true; - clockSupport = true; - }) - libsForQt5.qtstyleplugins ]; } diff --git a/home/natto/secrets/.zshenv_secret b/home/natto/secrets/.zshenv_secret new file mode 100644 index 0000000..b471b55 --- /dev/null +++ b/home/natto/secrets/.zshenv_secret @@ -0,0 +1,17 @@ +age-encryption.org/v1 +-> ssh-ed25519 kIk5ZQ e1cSQ/CPtYglZXXIQSM2pWQQ8FJQQepuqCXiIDU/Oyk +W3/7wgoihF+wusjGjSvKsn/jJqRSC0jUnWXY3Irvc4s +-> ssh-rsa lnK3Ng +NonFv6q2KMI4U/qNlgb01YOdeo7m7UkuU8rixgv8YZU+89ZfTWcuk946FffNT1Rs +7Y2JrK1YGQGXz2/sNJshJXKJKawRGfynWjSSPt5wiEYvetXnvD9xY36BYX482/59 +RhmsIVkAD8i809CZxpjukrwcrqCbqG7O7USe8suFlcYRIFP15jc3q5sMBUaIi982 +yZM2UeB4ep/onPLnrhiBPnhzMILkDQTcv6Ajmcax0ZrKTcZ7qoe1dgLmJKTNLA/5 +DNO3MT5m1wzx2KZ2FIjmpnJ+/yVXdIfSJgGnrR1qbHl3Zbji8EJx7fbUUddASvot +QS/OgRcYg063DDNCOycxCzpYVGCw6jWSpbohZnoy9+zhei2nnI/UHOZYng2OJ6vV +gP5BWwSBWXtX3UsrCZkLhTDMniU2Qje3S4b0jya8AIdpTLanrIS0GXSWzQTEx2gp +6OqNGXKa/LCAmFw83gC0VDdi6AgCTbBZT6Ul06dQiG4K5PgDtiysxcAb+HPUWJG+ + +-> #sFXk;-grease xnKp +RDMpdFSVKr7dC3z6iAF4QmYE +--- F4Uen8zSg6WsChoMDXaJSP/fLj/7QWI5jcQMFF0E9DM +U6҄e!31b1S,'C}8ddu4{^v/Zr$"RK :]ՉY6⃹fd}Cf&hkIyT6[Q٭7KKÊ:1xƫAlɏgol{V%S0n..Z*Jq \ No newline at end of file diff --git a/home/natto/secrets/.zshrc.age b/home/natto/secrets/.zshrc.age deleted file mode 100644 index 9a7d53e..0000000 Binary files a/home/natto/secrets/.zshrc.age and /dev/null differ diff --git a/home/natto/secrets/default.nix b/home/natto/secrets/default.nix deleted file mode 100644 index d253a77..0000000 --- a/home/natto/secrets/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, ... }: { - age = - let - home = config.home.homeDirectory; - in - { - sshKeyPaths = [ "${home}/.ssh/id_ed25519" ]; - secrets = { - mpdasrc = { - file = ./mpdasrc.age; - path = "${home}/.config/mpdasrc"; - }; - zshrc = { - file = ./.zshrc.age; - path = "${home}/.zshrc"; - mode = "660"; - }; - gitconfig = { - file = ./.gitconfig.age; - path = "${home}/.gitconfig"; - mode = "660"; - }; - }; - }; -} diff --git a/home/natto/secrets/fish_variables.age b/home/natto/secrets/fish_variables.age deleted file mode 100644 index b2aa3cd..0000000 Binary files a/home/natto/secrets/fish_variables.age and /dev/null differ diff --git a/home/natto/stuff.nix b/home/natto/stuff.nix index 09ec5bb..41daa04 100644 --- a/home/natto/stuff.nix +++ b/home/natto/stuff.nix @@ -4,11 +4,11 @@ userDirs.enable = true; }; + age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; + home = { sessionVariables = { LV2_PATH = lib.makeSearchPath "lib/lv2" (with pkgs; [ calf ]); - TERM = "st-24bits"; - QT_QPA_PLATFORMTHEME = "gtk2"; QT_X11_NO_MITSHM = "1"; HM_CONF_DIR = "/etc/nixos"; }; @@ -24,24 +24,10 @@ source = ./config/stalonetrayrc; target = "${home.homeDirectory}/.stalonetrayrc"; }; - ncmpcpp = { - source = ./config/ncmpcpp/config; - target = "${xdg.configHome}/ncmpcpp/config"; - }; mpv = { source = ./config/mpv/mpv.conf; target = "${xdg.configHome}/mpv/mpv.conf"; }; - packages = { - text = - let - packages = builtins.map (p: "${p.name}") config.home.packages; - sortedUnique = builtins.sort builtins.lessThan (lib.unique packages); - formatted = builtins.concatStringsSep "\n" sortedUnique; - in - formatted; - target = "${xdg.configHome}/${config.home.username}-packages"; - }; }; }; i18n = { diff --git a/home/natto/xsession.nix b/home/natto/xsession.nix index 3ab57ee..344a359 100644 --- a/home/natto/xsession.nix +++ b/home/natto/xsession.nix @@ -10,18 +10,6 @@ gtk.enable = true; }; - gtk = { - enable = true; - theme = { - package = pkgs.numix-solarized-gtk-theme; - name = "NumixSolarizedDarkMagenta"; - }; - iconTheme = { - package = pkgs.zafiro-icons; - name = "Zafiro-icons-Dark"; - }; - }; - xsession = { enable = true; windowManager = { @@ -38,4 +26,29 @@ }; }; }; + + home.packages = with pkgs; [ + (dmenu.override { patches = [ ./patches/dmenu.patch ]; }) + (st.override { + patches = [ ./patches/st.patch ]; + extraLibs = [ harfbuzz ]; + }) + xclip + xorg.xkbcomp + xorg.xmodmap + sxiv + xdotool + (xfce.thunar.override { + thunarPlugins = with xfce; [ + thunar-media-tags-plugin + thunar-volman + thunar-archive-plugin + ]; + }) + xfce.xfconf + xfce.tumbler + flameshot + xmobar + stalonetray + ]; } diff --git a/home/natto/zsh.nix b/home/natto/zsh.nix new file mode 100644 index 0000000..06574e3 --- /dev/null +++ b/home/natto/zsh.nix @@ -0,0 +1,33 @@ +{ config, ... }: +let + secretPath = "${config.home.homeDirectory}/.zshenv_secret"; +in +{ + programs.zsh = { + enable = true; + autocd = true; + history = rec { + expireDuplicatesFirst = true; + ignoreDups = true; + size = 30000; + save = size; + }; + enableAutosuggestions = true; + enableCompletion = true; + enableSyntaxHighlighting = true; + prezto = { + enable = true; + prompt.theme = "pure"; + autosuggestions.color = "fg=yellow,bold"; + }; + initExtra = '' + . ${secretPath}; + ''; + }; + + age.secrets.zshenv_secret = { + file = ./secrets/.zshenv_secret; + path = secretPath; + mode = "660"; + }; +} diff --git a/hosts/satori/default.nix b/hosts/satori/default.nix index 68fcaf7..62bfbad 100644 --- a/hosts/satori/default.nix +++ b/hosts/satori/default.nix @@ -10,6 +10,7 @@ ./services.nix ./graphics.nix ./xorg.nix + ./wayland.nix ./nix.nix ]; system.stateVersion = "21.05"; diff --git a/hosts/satori/pkgs.nix b/hosts/satori/pkgs.nix index 210ae62..3a7c036 100644 --- a/hosts/satori/pkgs.nix +++ b/hosts/satori/pkgs.nix @@ -31,42 +31,9 @@ }; }; - git = { - enable = true; - package = pkgs.git.override { - doInstallCheck = false; - sendEmailSupport = true; - withManual = false; - }; - }; - zsh = { - enable = true; - histSize = 30000; - enableCompletion = true; - enableBashCompletion = true; - syntaxHighlighting.enable = true; - autosuggestions = { - enable = true; - highlightStyle = "fg=yellow,bold"; - }; - ohMyZsh.enable = true; - }; adb.enable = true; light.enable = true; - /* proxychains = { - enable = true; - chain.type = "dynamic"; - proxyDNS = true; - proxies = { - remilia = { - enable = true; - type = "socks5"; - host = "127.0.0.1"; - port = 2217; - }; - }; - }; */ gamemode.enable = true; nm-applet.enable = true; }; diff --git a/hosts/satori/stuff.nix b/hosts/satori/stuff.nix index a87f518..7756ca0 100644 --- a/hosts/satori/stuff.nix +++ b/hosts/satori/stuff.nix @@ -19,6 +19,7 @@ ]; }; }; + console.useXkbConfig = true; fonts.fonts = with pkgs; [ fira-mono diff --git a/hosts/satori/xorg.nix b/hosts/satori/xorg.nix index 01f2871..658b20a 100644 --- a/hosts/satori/xorg.nix +++ b/hosts/satori/xorg.nix @@ -6,7 +6,6 @@ # ''; #in { - console.useXkbConfig = true; services = { xserver = { enable = true; @@ -35,8 +34,8 @@ symbolsFile = ./colemak; }; }; - layout = "colemak"; - xkbVariant = "dhz"; # trying to ditch DHz now + layout = "us"; + xkbVariant = "colemak_dh"; # trying to ditch DHz now autoRepeatDelay = 320; autoRepeatInterval = 30; };