diff options
Diffstat (limited to 'nix/modules')
| -rw-r--r-- | nix/modules/configuration.nix | 2 | ||||
| -rw-r--r-- | nix/modules/home/emacs.nix | 7 | ||||
| -rw-r--r-- | nix/modules/home/gtk.nix | 19 | ||||
| -rw-r--r-- | nix/modules/home/hyprland.nix | 5 | ||||
| -rw-r--r-- | nix/modules/home/user.nix | 11 | ||||
| -rw-r--r-- | nix/modules/kubo.nix | 14 |
6 files changed, 43 insertions, 15 deletions
diff --git a/nix/modules/configuration.nix b/nix/modules/configuration.nix index 749d725..7b862f9 100644 --- a/nix/modules/configuration.nix +++ b/nix/modules/configuration.nix @@ -426,7 +426,7 @@ nix = { settings = { - experimental-features = "nix-command flakes"; + experimental-features = "nix-command flakes ca-derivations"; trusted-users = [ "@wheel" ]; }; }; diff --git a/nix/modules/home/emacs.nix b/nix/modules/home/emacs.nix index c5bd383..6e36837 100644 --- a/nix/modules/home/emacs.nix +++ b/nix/modules/home/emacs.nix @@ -9,17 +9,18 @@ (setq system-email "${config.monorepo.profiles.email.email}") (setq system-username "${config.monorepo.vars.internetName}") (setq system-fullname "${config.monorepo.vars.fullName}") -(org-babel-load-file - (expand-file-name "~/${config.monorepo.vars.repoName}/config/emacs.org"))''; +(load "${pkgs.writeText "init.el" (builtins.readFile ../../init.el)}") +''; + extraPackages = epkgs: [ epkgs.agda2-mode epkgs.all-the-icons epkgs.auctex epkgs.catppuccin-theme - epkgs.chatgpt-shell epkgs.company epkgs.company-solidity epkgs.counsel + epkgs.centaur-tabs epkgs.dashboard epkgs.doom-themes epkgs.doom-modeline diff --git a/nix/modules/home/gtk.nix b/nix/modules/home/gtk.nix index 4e85b9d..902f993 100644 --- a/nix/modules/home/gtk.nix +++ b/nix/modules/home/gtk.nix @@ -2,7 +2,24 @@ { gtk = { theme = { - package = pkgs.catppuccin-gtk; + name = "catppuccin-mocha-pink-standard"; + package = pkgs.catppuccin-gtk.override { + variant = "mocha"; + accents = [ "pink" ]; + }; }; }; + xdg.configFile = { + "gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets"; + "gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css"; + "gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css"; + + "gtk-3.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-3.0/gtk.css"; + "gtk-3.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-3.0/gtk-dark.css"; + "gtk-3.0/settings.ini".text = '' + [Settings] + gtk-theme-name=${config.gtk.theme.name} + gtk-application-prefer-dark-theme=1 + ''; + }; } diff --git a/nix/modules/home/hyprland.nix b/nix/modules/home/hyprland.nix index 6561211..1d29b74 100644 --- a/nix/modules/home/hyprland.nix +++ b/nix/modules/home/hyprland.nix @@ -73,7 +73,10 @@ "$mod SHIFT, L, movewindow, r" "$mod SHIFT, K, movewindow, u" "$mod SHIFT, J, movewindow, d" - "$mod, T, togglefloating" + + "$mod SHIFT, T, togglefloating" + "$mod SHIFT, F, fullscreen" + "$mod, H, movefocus, l" "$mod, L, movefocus, r" "$mod, K, movefocus, u" diff --git a/nix/modules/home/user.nix b/nix/modules/home/user.nix index 680acd8..3cd4190 100644 --- a/nix/modules/home/user.nix +++ b/nix/modules/home/user.nix @@ -45,13 +45,13 @@ # Apps # octaveFull - vesktop grim swww vim telegram-desktop qwen-code fluffychat + vesktop grim swww vim telegram-desktop qwen-code fluffychat jami # Sound/media pavucontrol alsa-utils imagemagick ffmpeg helvum # Net - curl rsync git iamb + curl rsync git iamb ungoogled-chromium # Tor torsocks tor-browser @@ -151,12 +151,5 @@ cd "$HOME" }; programs.bash.enable = true; - - gtk = { - enable = lib.mkDefault config.monorepo.profiles.graphics.enable; - theme = null; - iconTheme = null; - }; - fonts.fontconfig.enable = true; } diff --git a/nix/modules/kubo.nix b/nix/modules/kubo.nix index 79aa9aa..c64295d 100644 --- a/nix/modules/kubo.nix +++ b/nix/modules/kubo.nix @@ -2,5 +2,19 @@ { services.kubo = { enable = lib.mkDefault config.monorepo.profiles.workstation.enable; + autoMount = false; + enableGC = true; + settings = { + Addresses.API = [ + "/ip4/127.0.0.1/tcp/5001" + ]; + Bootstrap = [ + "/ip4/128.199.219.111/tcp/4001/ipfs/QmSoLSafTMBsPKadTEgaXctDQVcqN88CNLHXMkTNwMKPnu" + "/ip4/162.243.248.213/tcp/4001/ipfs/QmSoLueR4xBeUbY9WZ9xGUUxunbKWcrNFTDAadQJmocnWm" + ]; + Datastore = { + StorageMax = "20GB"; + }; + }; }; } |
