From 0d7aa6843bf8f5c1643d3451daa7df0d92c1c751 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Thu, 3 Apr 2025 02:26:24 +0100 Subject: [PATCH] cityseventeen: rename and make tokyo night --- flake.lock | 64 +++++----- hosts/{solterra => cityseventeen}/apps.nix | 48 ++------ hosts/{solterra => cityseventeen}/default.nix | 33 ++--- hosts/{solterra => cityseventeen}/fonts.nix | 12 +- hosts/{solterra => cityseventeen}/forgejo.nix | 0 .../{solterra => cityseventeen}/hardware.nix | 27 ++++- .../{solterra => cityseventeen}/jellyfin.nix | 0 hosts/cityseventeen/theme.nix | 44 +++++++ .../users/arturm}/.face.icon | Bin .../users/arturm/configs/foot/foot.ini | 29 +++++ .../users/arturm/configs/fuzzel/fuzzel.ini | 113 ++++++++++++++++++ .../users/arturm}/configs/git/gitconfig | 0 .../users/arturm}/configs/kanshi/config | 0 .../arturm}/configs/kitty/current-theme.conf | 0 .../users/arturm}/configs/kitty/kitty.conf | 0 .../users/arturm/configs/mako/config | 7 ++ .../users/arturm}/configs/niri/config.kdl | 8 +- .../arturm/configs/qutebrowser/config.py | 37 ++++++ .../configs/qutebrowser/theme/__init__.py | 0 .../users/arturm}/configs/river/init | 0 .../arturm}/configs/river/scripts/waybar.sh | 0 .../arturm}/configs/vesktop/quickCss.css | 0 .../users/arturm}/configs/waybar/config.jsonc | 0 .../users/arturm/configs/waybar/style.css | 38 ++++++ .../users/arturm}/default.nix | 10 +- hosts/default.nix | 2 +- hosts/shared/dconf.nix | 41 ++++--- hosts/solterra/disks.nix | 67 ----------- hosts/solterra/theme.nix | 31 ----- .../users/artur/configs/foot/foot.ini | 29 ----- .../solterra/users/artur/configs/mako/config | 7 -- .../users/artur/configs/qutebrowser/config.py | 37 ------ .../users/artur/configs/rofi/config.rasi | 98 --------------- .../artur/configs/rofi/themes/base16.rasi | 11 -- .../users/artur/configs/waybar/style.css | 37 ------ shells/default.nix | 2 +- 36 files changed, 394 insertions(+), 438 deletions(-) rename hosts/{solterra => cityseventeen}/apps.nix (56%) rename hosts/{solterra => cityseventeen}/default.nix (60%) rename hosts/{solterra => cityseventeen}/fonts.nix (52%) rename hosts/{solterra => cityseventeen}/forgejo.nix (100%) rename hosts/{solterra => cityseventeen}/hardware.nix (64%) rename hosts/{solterra => cityseventeen}/jellyfin.nix (100%) create mode 100644 hosts/cityseventeen/theme.nix rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/.face.icon (100%) create mode 100644 hosts/cityseventeen/users/arturm/configs/foot/foot.ini create mode 100644 hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/configs/git/gitconfig (100%) rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/configs/kanshi/config (100%) rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/configs/kitty/current-theme.conf (100%) rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/configs/kitty/kitty.conf (100%) create mode 100644 hosts/cityseventeen/users/arturm/configs/mako/config rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/configs/niri/config.kdl (99%) create mode 100644 hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/configs/qutebrowser/theme/__init__.py (100%) rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/configs/river/init (100%) rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/configs/river/scripts/waybar.sh (100%) rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/configs/vesktop/quickCss.css (100%) rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/configs/waybar/config.jsonc (100%) create mode 100644 hosts/cityseventeen/users/arturm/configs/waybar/style.css rename hosts/{solterra/users/artur => cityseventeen/users/arturm}/default.nix (84%) delete mode 100644 hosts/solterra/disks.nix delete mode 100644 hosts/solterra/theme.nix delete mode 100644 hosts/solterra/users/artur/configs/foot/foot.ini delete mode 100644 hosts/solterra/users/artur/configs/mako/config delete mode 100644 hosts/solterra/users/artur/configs/qutebrowser/config.py delete mode 100644 hosts/solterra/users/artur/configs/rofi/config.rasi delete mode 100644 hosts/solterra/users/artur/configs/rofi/themes/base16.rasi delete mode 100644 hosts/solterra/users/artur/configs/waybar/style.css diff --git a/flake.lock b/flake.lock index 06b9f92..e7249eb 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": ["nixpkgs"] }, "locked": { - "lastModified": 1742343598, - "narHash": "sha256-8m9VIVrX6T3C5iUgDMmfOl3MGI7pQ+OpF9NutaY/a2Q=", + "lastModified": 1743642601, + "narHash": "sha256-rEjKybbbO8XwKSPAG7WVKU/qw6ylglbj2+tATLfc2+Q=", "ref": "refs/heads/master", - "rev": "f9d95a8775db797a6aa4f754bd7357ce1281eaf6", - "revCount": 6, + "rev": "941c8803b3957c14523f2c40a8d189caedecb17c", + "revCount": 10, "type": "git", "url": "https://copeberg.org/amadaluzia/alqages.git" }, @@ -47,11 +47,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1743000413, - "narHash": "sha256-3F9ap1452VmR8xDjUmeCf9h2nnRIODY4Fh5RnCr0d0s=", + "lastModified": 1743630992, + "narHash": "sha256-4QKnn7sHskureX2DvKcvxR4tbjauSoCPVQJ+I8PAAUg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "21c2b03a213775c88eb0738f9ceb2e02b8463981", + "rev": "421cce2410fe9f0a71c717e1e28d37eb4ddd0283", "type": "github" }, "original": { @@ -66,11 +66,11 @@ "nixpkgs": ["nixpkgs"] }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1743598667, + "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "nixpkgs-lib": ["nixpkgs"] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -237,11 +237,11 @@ }, "gimp-nixpkgs": { "locked": { - "lastModified": 1743096774, - "narHash": "sha256-tjCCBuGLSPOpIpazf6Wy5042pj0wmlDgdcRh3lRd7ew=", + "lastModified": 1743550502, + "narHash": "sha256-+n8Odooi32fHtpW0MbbP0sXH2UYYGl3C2QuOiuLps2c=", "owner": "jtojnar", "repo": "nixpkgs", - "rev": "265994a36baa8011f26b8f56dc691d25a84b6b23", + "rev": "fa4992dd39f48279eb33db114c623abccae09384", "type": "github" }, "original": { @@ -314,11 +314,11 @@ "nixpkgs": ["chaotic", "nixpkgs"] }, "locked": { - "lastModified": 1742871411, - "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", + "lastModified": 1743527271, + "narHash": "sha256-EuanEW1qqXZ2h0zJnq7uz8BoHbsgHgUrqWkCZHwZ9FA=", "owner": "nix-community", "repo": "home-manager", - "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", + "rev": "f4d9d1e2ad19d544a0a0cf3f8f371c6139c762e9", "type": "github" }, "original": { @@ -333,11 +333,11 @@ "nixpkgs": ["chaotic", "nixpkgs"] }, "locked": { - "lastModified": 1742465245, - "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=", + "lastModified": 1743144043, + "narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287", + "rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24", "type": "github" }, "original": { @@ -402,11 +402,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -474,11 +474,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { @@ -587,11 +587,11 @@ "nixpkgs": ["nixpkgs"] }, "locked": { - "lastModified": 1743106117, - "narHash": "sha256-SZVb+0hGZzwhYV3uKAZRrwBp+Knq5o+h7/1mWdLk32w=", + "lastModified": 1743532009, + "narHash": "sha256-yRZifkvaNiPuDguFRubAeUqVsfsEAaT1201Ck1P0p2w=", "ref": "main", - "rev": "eac76a6d9ea38f2875a62450f1696e2840a38e0f", - "revCount": 106, + "rev": "cd8e902b57b31dd78aa8fda1b40cde3862184aa1", + "revCount": 108, "type": "git", "url": "https://copeberg.org/amadaluzia/pankomacs.git" }, diff --git a/hosts/solterra/apps.nix b/hosts/cityseventeen/apps.nix similarity index 56% rename from hosts/solterra/apps.nix rename to hosts/cityseventeen/apps.nix index 6fc5a38..572cd69 100644 --- a/hosts/solterra/apps.nix +++ b/hosts/cityseventeen/apps.nix @@ -1,19 +1,11 @@ { inputs, pkgs, - lib, ... }: { environment = { - systemPackages = builtins.attrValues { - inherit (pkgs) - nil - statix - deadnix - alejandra - ; - }; + systemPackages = [ pkgs.amadaluzian-zsh ]; sessionVariables.EDITOR = "emacsclient -c"; shellAliases = { "e" = "$EDITOR"; @@ -24,7 +16,7 @@ programs = { swaybg = { enable = true; - wallpaper = inputs.wallpkgs.wallpapers.dracula.dracula-ship.path; + wallpaper = inputs.wallpkgs.wallpapers.tokyo-night.tokyo_night-05.path; }; waybar = { enable = true; @@ -33,37 +25,18 @@ direnv.enable = true; openssh.enable = true; }; - shells.nushell = { - enable = true; - package = pkgs.amadaluzian-nu; - }; system.pipewire.enable = true; wms.niri.enable = true; }; programs = { - nh = { - enable = true; - clean.enable = true; - package = pkgs.symlinkJoin { - name = "nh"; - paths = [ - pkgs.nh - ]; - nativeBuildInputs = [ - pkgs.makeWrapper - ]; - postBuild = '' - wrapProgram $out/bin/nh \ - --set FLAKE "/home/artur/.config/nixos" - ''; - meta = { inherit (pkgs.nh.meta) mainProgram; }; - }; - }; git = { enable = true; package = pkgs.gitFull; }; + zsh = { + enable = true; + }; }; services = { @@ -71,23 +44,20 @@ enable = true; web.enable = false; }; - rsyncd.enable = true; emacs = { enable = true; package = inputs.pankomacs.packages.${pkgs.system}.pgtk; startWithGraphical = true; install = true; }; + rsyncd.enable = true; }; - virtualisation.virtualbox.host = { - enable = true; - enableKvm = true; - addNetworkInterface = false; + nix.gc = { + dates = "weekly"; + automatic = true; }; - nix.gc.automatic = lib.mkForce false; - xdg.mime = { enable = true; defaultApplications = { diff --git a/hosts/solterra/default.nix b/hosts/cityseventeen/default.nix similarity index 60% rename from hosts/solterra/default.nix rename to hosts/cityseventeen/default.nix index ec337c4..c89d466 100644 --- a/hosts/solterra/default.nix +++ b/hosts/cityseventeen/default.nix @@ -5,9 +5,8 @@ }: { imports = [ - ./users/artur + ./users/arturm ./hardware.nix - ./disks.nix ./theme.nix ./apps.nix ./fonts.nix @@ -17,7 +16,14 @@ config = { boot = { - initrd.systemd.additionalUpstreamUnits = [ "systemd-boot.service" ]; + initrd = { + systemd.additionalUpstreamUnits = [ "systemd-boot.service" ]; + luks.devices = { + "luks-c354eb7f-1e69-4054-afa2-8c4e81a761fa" = { + device = "/dev/disk/by-uuid/c354eb7f-1e69-4054-afa2-8c4e81a761fa"; + }; + }; + }; loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; @@ -28,22 +34,21 @@ inputs.alqages.overlays.default ]; - nix.package = pkgs.lix; - console = { font = "Lat2-Terminus16"; keyMap = "us"; }; services = { - xserver.xkb = { - layout = "us"; - options = "eurosign:e,ctrl:nocaps"; - }; - - displayManager.sddm = { - enable = true; - wayland.enable = true; + xserver = { + xkb = { + layout = "us"; + options = "eurosign:e,ctrl:nocaps"; + }; + displayManager.gdm = { + enable = true; + wayland = true; + }; }; udev.packages = [ @@ -61,7 +66,7 @@ networking.networkmanager.enable = true; time.timeZone = "Europe/London"; - i18n.defaultLocale = "de_DE.UTF-8"; + i18n.defaultLocale = "en_US.UTF-8"; system.stateVersion = "24.11"; }; } diff --git a/hosts/solterra/fonts.nix b/hosts/cityseventeen/fonts.nix similarity index 52% rename from hosts/solterra/fonts.nix rename to hosts/cityseventeen/fonts.nix index d2ee779..16038bb 100644 --- a/hosts/solterra/fonts.nix +++ b/hosts/cityseventeen/fonts.nix @@ -2,16 +2,16 @@ { alqueva.system.fonts = { names = { - sansSerif = [ "Inter" ]; - monospace = [ "Maple Mono NL" ]; + sansSerif = [ "Adwaita Sans" ]; + monospace = [ "Adwaita Mono" ]; serif = [ "Merriweather" ]; - emoji = [ "Twitter Color Emoji" ]; + emoji = [ "Noto Fonts Color Emoji" ]; }; packages = { - sansSerif = [ pkgs.inter ]; - monospace = [ pkgs.maple-mono.NL-TTF ]; + sansSerif = [ pkgs.adwaita-fonts ]; + monospace = [ pkgs.adwaita-fonts ]; serif = [ pkgs.merriweather ]; - emoji = [ pkgs.twitter-color-emoji ]; + emoji = [ pkgs.noto-fonts-color-emoji ]; extra = [ pkgs.noto-fonts pkgs.nerd-fonts.symbols-only diff --git a/hosts/solterra/forgejo.nix b/hosts/cityseventeen/forgejo.nix similarity index 100% rename from hosts/solterra/forgejo.nix rename to hosts/cityseventeen/forgejo.nix diff --git a/hosts/solterra/hardware.nix b/hosts/cityseventeen/hardware.nix similarity index 64% rename from hosts/solterra/hardware.nix rename to hosts/cityseventeen/hardware.nix index 8b67705..fe1799d 100644 --- a/hosts/solterra/hardware.nix +++ b/hosts/cityseventeen/hardware.nix @@ -7,15 +7,17 @@ modulesPath, ... }: + { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ - "nvme" "xhci_pci" "ahci" + "nvme" + "usb_storage" "usbhid" "sd_mod" ]; @@ -23,12 +25,33 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + fileSystems."/" = { + device = "/dev/disk/by-uuid/1076cf01-0d74-44fa-b24f-a795191fad83"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-16d833f7-9082-4bf0-b027-98102c786a01".device = + "/dev/disk/by-uuid/16d833f7-9082-4bf0-b027-98102c786a01"; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/6143-FAFA"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" + ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/203bcb2c-a264-4243-9518-d1f975aea05c"; } + ]; + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true; + # networking.interfaces.eno1.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/solterra/jellyfin.nix b/hosts/cityseventeen/jellyfin.nix similarity index 100% rename from hosts/solterra/jellyfin.nix rename to hosts/cityseventeen/jellyfin.nix diff --git a/hosts/cityseventeen/theme.nix b/hosts/cityseventeen/theme.nix new file mode 100644 index 0000000..464dae8 --- /dev/null +++ b/hosts/cityseventeen/theme.nix @@ -0,0 +1,44 @@ +{ + pkgs, + ... +}: +let + themes = { + gtk = { + name = "Tokyonight-Dark"; + package = pkgs.tokyonight-gtk-theme; + }; + icons = { + name = "Adwaita"; + package = pkgs.adwaita-icon-theme; + }; + cursor = { + name = "Simp1e-Tokyo-Night"; + package = pkgs.simp1e-cursors; + }; + }; +in +{ + alqueva.system.dconf = { + enable = true; + luminosity = "dark"; + theme = themes.gtk.name; + icon.theme = themes.icons.name; + cursor = { + size = 24; + theme = themes.cursor.name; + }; + }; + + qt = { + enable = true; + platformTheme = "qt5ct"; + style = "kvantum"; + }; + + systemd.user.tmpfiles.rules = [ + "L+ %h/.config/gtk-4.0 - - - - ${themes.gtk.package}/share/themes/${themes.gtk.name}/gtk-4.0" + ]; + + environment.systemPackages = builtins.attrValues (builtins.mapAttrs (_: v: v.package) themes); +} diff --git a/hosts/solterra/users/artur/.face.icon b/hosts/cityseventeen/users/arturm/.face.icon similarity index 100% rename from hosts/solterra/users/artur/.face.icon rename to hosts/cityseventeen/users/arturm/.face.icon diff --git a/hosts/cityseventeen/users/arturm/configs/foot/foot.ini b/hosts/cityseventeen/users/arturm/configs/foot/foot.ini new file mode 100644 index 0000000..21becc0 --- /dev/null +++ b/hosts/cityseventeen/users/arturm/configs/foot/foot.ini @@ -0,0 +1,29 @@ +[main] +pad=12x12 +font=monospace:size=16.5 + +[colors] +foreground=a9b1d6 +background=1a1b26 +regular0=16161e # black +regular1=c0caf5 # red +regular2=9ece6a # green +regular3=0db9d7 # yellow +regular4=2ac3de # blue +regular5=bb9af7 # magenta +regular6=b4f9f8 # cyan +regular7=cbccd1 # white +bright0=2f3549 # bright black +bright1=c0caf5 # bright red +bright2=9ece6a # bright green +bright3=0db9d7 # bright yellow +bright4=2ac3de # bright blue +bright5=bb9af7 # bright magenta +bright6=b4f9f8 # bright cyan +bright7=d5d6db # bright white +16=a9b1d6 +17=f7768e +18=16161e +19=2f3549 +20=787c99 +21=cbccd1 \ No newline at end of file diff --git a/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini b/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini new file mode 100644 index 0000000..5a5b527 --- /dev/null +++ b/hosts/cityseventeen/users/arturm/configs/fuzzel/fuzzel.ini @@ -0,0 +1,113 @@ +# output= +font=Monospace:size=16 +# dpi-aware=auto +# use-bold=no +# prompt="> " +# placeholder= +# icon-theme=hicolor +# icons-enabled=yes +# hide-before-typing=no +# fields=filename,name,generic +# password-character=* +# filter-desktop=no +# match-mode=fzf +# sort-result=yes +# match-counter=no +# delayed-filter-ms=300 +# delayed-filter-limit=20000 +# show-actions=no +# terminal=$TERMINAL -e # Note: you cannot actually use environment variables here +# launch-prefix= +# list-executables-in-path=no + +# anchor=center +# x-margin=0 +# y-margin=0 +# lines=15 +# width=30 +# tabs=8 +# horizontal-pad=40 +# vertical-pad=8 +# inner-pad=0 + +# image-size-ratio=0.5 + +# line-height= +# letter-spacing=0 + +# layer=overlay +# keyboard-focus=on-demand +# exit-on-keyboard-focus-loss=yes + +# cache= + +# render-workers= +# match-workers= + +[colors] +background=1A1B26ff +text=A9B1D6ff +match=2AC3DEff +selection=444B6Aff +selection-text=CBCCD1ff +selection-match=2AC3DEff +border=A9B1D6ff + +[border] +width=1 +radius=0 + +[dmenu] +# mode=text # text|index +# exit-immediately-if-empty=no + +[key-bindings] +# cancel=Escape Control+g Control+c Control+bracketleft +# execute=Return KP_Enter Control+y +# execute-or-next=Tab +# execute-input=Shift+Return Shift+KP_Enter +# cursor-left=Left Control+b +# cursor-left-word=Control+Left Mod1+b +# cursor-right=Right Control+f +# cursor-right-word=Control+Right Mod1+f +# cursor-home=Home Control+a +# cursor-end=End Control+e +# delete-prev=BackSpace Control+h +# delete-prev-word=Mod1+BackSpace Control+BackSpace Control+w +# delete-line-backward=Control+u +# delete-next=Delete KP_Delete Control+d +# delete-next-word=Mod1+d Control+Delete Control+KP_Delete +# delete-line-forward=Control+k +# prev=Up Control+p +# prev-with-wrap=ISO_Left_Tab +# prev-page=Page_Up KP_Page_Up +# next=Down Control+n +# next-with-wrap=none +# next-page=Page_Down KP_Page_Down +# expunge=Shift+Delete +# clipboard-paste=Control+v XF86Paste +# primary-paste=Shift+Insert Shift+KP_Insert + +# custom-N: *dmenu mode only*. Like execute, but with a non-zero +# exit-code; custom-1 exits with code 10, custom-2 with 11, custom-3 +# with 12, and so on. + +# custom-1=Mod1+1 +# custom-2=Mod1+2 +# custom-3=Mod1+3 +# custom-4=Mod1+4 +# custom-5=Mod1+5 +# custom-6=Mod1+6 +# custom-7=Mod1+7 +# custom-8=Mod1+8 +# custom-9=Mod1+9 +# custom-10=Mod1+0 +# custom-11=Mod1+exclam +# custom-12=Mod1+at +# custom-13=Mod1+numbersign +# custom-14=Mod1+dollar +# custom-15=Mod1+percent +# custom-16=Mod1+dead_circumflex +# custom-17=Mod1+ampersand +# custom-18=Mod1+asterix +# custom-19=Mod1+parentleft diff --git a/hosts/solterra/users/artur/configs/git/gitconfig b/hosts/cityseventeen/users/arturm/configs/git/gitconfig similarity index 100% rename from hosts/solterra/users/artur/configs/git/gitconfig rename to hosts/cityseventeen/users/arturm/configs/git/gitconfig diff --git a/hosts/solterra/users/artur/configs/kanshi/config b/hosts/cityseventeen/users/arturm/configs/kanshi/config similarity index 100% rename from hosts/solterra/users/artur/configs/kanshi/config rename to hosts/cityseventeen/users/arturm/configs/kanshi/config diff --git a/hosts/solterra/users/artur/configs/kitty/current-theme.conf b/hosts/cityseventeen/users/arturm/configs/kitty/current-theme.conf similarity index 100% rename from hosts/solterra/users/artur/configs/kitty/current-theme.conf rename to hosts/cityseventeen/users/arturm/configs/kitty/current-theme.conf diff --git a/hosts/solterra/users/artur/configs/kitty/kitty.conf b/hosts/cityseventeen/users/arturm/configs/kitty/kitty.conf similarity index 100% rename from hosts/solterra/users/artur/configs/kitty/kitty.conf rename to hosts/cityseventeen/users/arturm/configs/kitty/kitty.conf diff --git a/hosts/cityseventeen/users/arturm/configs/mako/config b/hosts/cityseventeen/users/arturm/configs/mako/config new file mode 100644 index 0000000..470fc74 --- /dev/null +++ b/hosts/cityseventeen/users/arturm/configs/mako/config @@ -0,0 +1,7 @@ +font=monospace 15 +width=450 +height=220 +text-color=#A9B1D6ff +background-color=#16161Eff +border-color=#0DB9D7ff +border-size=1 \ No newline at end of file diff --git a/hosts/solterra/users/artur/configs/niri/config.kdl b/hosts/cityseventeen/users/arturm/configs/niri/config.kdl similarity index 99% rename from hosts/solterra/users/artur/configs/niri/config.kdl rename to hosts/cityseventeen/users/arturm/configs/niri/config.kdl index 1d7835d..8beeef7 100644 --- a/hosts/solterra/users/artur/configs/niri/config.kdl +++ b/hosts/cityseventeen/users/arturm/configs/niri/config.kdl @@ -190,8 +190,8 @@ layout { // off width 1 - active-color "#bd93f9" - inactive-color "#6272a4" + active-color "#b4f9f8" + inactive-color "#16161e" // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" @@ -302,7 +302,7 @@ binds { // Suggested binds for running programs: terminal, app launcher, screen locker. Mod+E { spawn "emacsclient" "-c"; } Mod+T { spawn "foot"; } - Mod+D { spawn "rofi" "-show" "drun"; } + Mod+D { spawn "fuzzel"; } // Super+Alt+L { spawn "swaylock"; } // You can also use a shell. Do this if you need pipes, multiple commands, etc. @@ -518,6 +518,6 @@ binds { } cursor { - xcursor-theme "Dracula-cursors" + xcursor-theme "Simp1e-Tokyo-Night" xcursor-size 24 } diff --git a/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py b/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py new file mode 100644 index 0000000..2d88006 --- /dev/null +++ b/hosts/cityseventeen/users/arturm/configs/qutebrowser/config.py @@ -0,0 +1,37 @@ +from theme import load_theme + +config.load_autoconfig() + +tokyo_night = { + "base00": "#1a1b26", + "base01": "#16161e", + "base02": "#2f3549", + "base03": "#444b6a", + "base04": "#787c99", + "base05": "#a9b1d6", + "base06": "#cbccd1", + "base07": "#d5d6db", + "base08": "#c0caf5", + "base09": "#a9b1d6", + "base0A": "#0db9d7", + "base0B": "#9ece6a", + "base0C": "#b4f9f8", + "base0D": "#2ac3de", + "base0E": "#bb9af7", + "base0F": "#f7768e", +} + +load_theme(c, tokyo_night) + +c.colors.webpage.preferred_color_scheme = "dark" +c.tabs.position = "top" +c.tabs.width = 32 +c.fonts.default_size = "13pt" +c.fonts.default_family = "sans-serif" +c.tabs.padding = { + "bottom": 4, + "top": 4, + "left": 6, + "right": 6, +} +c.tabs.indicator.width = 0 diff --git a/hosts/solterra/users/artur/configs/qutebrowser/theme/__init__.py b/hosts/cityseventeen/users/arturm/configs/qutebrowser/theme/__init__.py similarity index 100% rename from hosts/solterra/users/artur/configs/qutebrowser/theme/__init__.py rename to hosts/cityseventeen/users/arturm/configs/qutebrowser/theme/__init__.py diff --git a/hosts/solterra/users/artur/configs/river/init b/hosts/cityseventeen/users/arturm/configs/river/init similarity index 100% rename from hosts/solterra/users/artur/configs/river/init rename to hosts/cityseventeen/users/arturm/configs/river/init diff --git a/hosts/solterra/users/artur/configs/river/scripts/waybar.sh b/hosts/cityseventeen/users/arturm/configs/river/scripts/waybar.sh similarity index 100% rename from hosts/solterra/users/artur/configs/river/scripts/waybar.sh rename to hosts/cityseventeen/users/arturm/configs/river/scripts/waybar.sh diff --git a/hosts/solterra/users/artur/configs/vesktop/quickCss.css b/hosts/cityseventeen/users/arturm/configs/vesktop/quickCss.css similarity index 100% rename from hosts/solterra/users/artur/configs/vesktop/quickCss.css rename to hosts/cityseventeen/users/arturm/configs/vesktop/quickCss.css diff --git a/hosts/solterra/users/artur/configs/waybar/config.jsonc b/hosts/cityseventeen/users/arturm/configs/waybar/config.jsonc similarity index 100% rename from hosts/solterra/users/artur/configs/waybar/config.jsonc rename to hosts/cityseventeen/users/arturm/configs/waybar/config.jsonc diff --git a/hosts/cityseventeen/users/arturm/configs/waybar/style.css b/hosts/cityseventeen/users/arturm/configs/waybar/style.css new file mode 100644 index 0000000..6d35c30 --- /dev/null +++ b/hosts/cityseventeen/users/arturm/configs/waybar/style.css @@ -0,0 +1,38 @@ +@define-color base00 #1A1B26; +@define-color base01 #16161E; +@define-color base02 #2F3549; +@define-color base03 #444B6A; +@define-color base04 #787C99; +@define-color base05 #A9B1D6; +@define-color base06 #CBCCD1; +@define-color base07 #D5D6DB; +@define-color base08 #C0CAF5; +@define-color base09 #A9B1D6; +@define-color base0A #0DB9D7; +@define-color base0B #9ECE6A; +@define-color base0C #B4F9F8; +@define-color base0D #2AC3DE; +@define-color base0E #BB9AF7; +@define-color base0F #F7768E; + +* { + color: @base05; + font-family: monospace; + font-size: 17px; + border-radius: 0px; + border: none; +} + +window#waybar { + background: @base01; +} + +.modules-right, +.modules-left { + padding: 0px 10px; +} + +#custom-nixos { + color: @base0D; + font-size: 24px; +} diff --git a/hosts/solterra/users/artur/default.nix b/hosts/cityseventeen/users/arturm/default.nix similarity index 84% rename from hosts/solterra/users/artur/default.nix rename to hosts/cityseventeen/users/arturm/default.nix index 29fa3cd..2fde903 100644 --- a/hosts/solterra/users/artur/default.nix +++ b/hosts/cityseventeen/users/arturm/default.nix @@ -1,20 +1,19 @@ { inputs, pkgs, - config, ... }: { - alqueva.users.artur = { - shell = config.alqueva.shells.nushell.package; + alqueva.users.arturm = { + shell = pkgs.zsh; tmpfiles = [ "L+ %h/.config/qutebrowser/config.py - - - - ${./configs/qutebrowser/config.py}" "L+ %h/.config/qutebrowser/theme - - - - ${./configs/qutebrowser/theme}" "L+ %h/.config/kanshi/ - - - - ${./configs/kanshi}" "L+ %h/.config/mako/ - - - - ${./configs/mako}" "L+ %h/.config/niri/ - - - - ${./configs/niri}" - "L+ %h/.config/rofi/ - - - - ${./configs/rofi}" "L+ %h/.config/foot - - - - ${./configs/foot}" + "L+ %h/.config/fuzzel - - - - ${./configs/fuzzel}" "L+ %h/.config/waybar - - - - ${./configs/waybar}" "L+ %h/.face.icon - - - - ${./.face.icon}" "L+ %h/.gitconfig - - - - ${./configs/git/gitconfig}" @@ -36,7 +35,7 @@ qutebrowser mako gh - rofi-wayland + fuzzel foot signal-desktop dino @@ -44,7 +43,6 @@ vesktop ; inherit (inputs.hetch.packages.${pkgs.system}) hetch; - inherit (inputs.gimp-nixpkgs.legacyPackages.${pkgs.system}) gimp; }; groups = [ "wheel" diff --git a/hosts/default.nix b/hosts/default.nix index 2553bea..1e32f5d 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -9,7 +9,7 @@ in { flake = { nixosConfigurations = mkHosts { - solterra = { + cityseventeen = { system = "x86_64-linux"; extraModules = [ inputs.disko.nixosModules.disko diff --git a/hosts/shared/dconf.nix b/hosts/shared/dconf.nix index 21acdbc..eff0555 100644 --- a/hosts/shared/dconf.nix +++ b/hosts/shared/dconf.nix @@ -5,13 +5,22 @@ }: let cfg = config.alqueva.system.dconf; - inherit (lib) types; + inherit (lib.options) mkEnableOption mkOption; + inherit (lib.types) + str + enum + attrs + listOf + ints + package + ; + inherit (lib.modules) mkIf; in { options.alqueva.system.dconf = { - enable = lib.mkEnableOption "configuration with DConf"; - luminosity = lib.mkOption { - type = types.enum [ + enable = mkEnableOption "configuration with DConf"; + luminosity = mkOption { + type = enum [ "dark" "light" "default" @@ -20,36 +29,36 @@ in description = "The luminosity you want to use for GTK."; apply = lum: if lum == "default" then lum else "prefer-${lum}"; }; - theme = lib.mkOption { - type = types.str; + theme = mkOption { + type = str; description = "The theme you want to use for GTK."; default = ""; }; - icon.theme = lib.mkOption { - type = types.str; + icon.theme = mkOption { + type = str; description = "The icon theme you want to use for GTK."; default = ""; }; cursor = { - theme = lib.mkOption { - type = types.str; + theme = mkOption { + type = str; description = "The cursor theme you want to use for GTK."; default = ""; }; - size = lib.mkOption { - type = types.ints.u32; + size = mkOption { + type = ints.u32; default = 24; description = "The cursor size you want to use for GTK."; apply = size: lib.gvariant.mkUint32 size; }; }; - extraDconfPackages = lib.mkOption { - type = types.listOf types.package; + extraDconfPackages = mkOption { + type = listOf package; description = "Extra packages to install for DConf."; default = [ ]; }; - extraDconfSettings = lib.mkOption { - type = types.attrsOf types.anything; + extraDconfSettings = mkOption { + type = attrs; description = "Extra settings you want to apply to DConf."; default = { }; }; diff --git a/hosts/solterra/disks.nix b/hosts/solterra/disks.nix deleted file mode 100644 index b625227..0000000 --- a/hosts/solterra/disks.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ - disko.devices = { - disk = { - main = { - type = "disk"; - device = "/dev/disk/by-id/nvme-WDC_PC_SN520_SDAPNUW-256G-1014_20270F804683"; - content = { - type = "gpt"; - partitions = { - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ "defaults" ]; - }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "utero"; - passwordFile = "/tmp/secret.key"; # Interactive - settings = { - allowDiscards = true; - }; - content = { - type = "btrfs"; - extraArgs = [ "-f" ]; - subvolumes = { - "/@root" = { - mountpoint = "/"; - mountOptions = [ - "compress=zstd" - "noatime" - ]; - }; - "/@home" = { - mountpoint = "/home"; - mountOptions = [ - "compress=zstd" - "noatime" - ]; - }; - "/@nix" = { - mountpoint = "/nix"; - mountOptions = [ - "compress=zstd" - "noatime" - ]; - }; - "/@swap" = { - mountpoint = "/.swapvol"; - swap.swapfile.size = "8G"; - }; - }; - }; - }; - }; - }; - }; - }; - }; - }; -} diff --git a/hosts/solterra/theme.nix b/hosts/solterra/theme.nix deleted file mode 100644 index 7710327..0000000 --- a/hosts/solterra/theme.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - pkgs, - ... -}: -let - themes = { - gtk-theme = pkgs.dracula-theme-git; - icon-theme = pkgs.dracula-icon-theme; - cursor-theme = themes.icon-theme; - }; -in -{ - alqueva.system.dconf = { - enable = true; - luminosity = "dark"; - theme = "Dracula"; - icon.theme = "Dracula"; - cursor = { - size = 24; - theme = "Dracula-cursors"; - }; - }; - - qt = { - enable = true; - platformTheme = "gnome"; - style = "adwaita-dark"; - }; - - environment.systemPackages = builtins.attrValues themes; -} diff --git a/hosts/solterra/users/artur/configs/foot/foot.ini b/hosts/solterra/users/artur/configs/foot/foot.ini deleted file mode 100644 index a9ffa90..0000000 --- a/hosts/solterra/users/artur/configs/foot/foot.ini +++ /dev/null @@ -1,29 +0,0 @@ -[main] -pad=12x12 -font=monospace:size=16.5 - -[colors] -foreground=f8f8f2 -background=282a36 -regular0=363447 # black -regular1=ff5555 # red -regular2=50fa7b # green -regular3=f1fa8c # yellow -regular4=80bfff # blue -regular5=ff79c6 # magenta -regular6=8be9fd # cyan -regular7=f0f1f4 # white -bright0=44475a # bright black -bright1=ff5555 # bright red -bright2=50fa7b # bright green -bright3=f1fa8c # bright yellow -bright4=80bfff # bright blue -bright5=ff79c6 # bright magenta -bright6=8be9fd # bright cyan -bright7=ffffff # bright white -16=ffb86c -17=bd93f9 -18=363447 -19=44475a -20=9ea8c7 -21=f0f1f4 \ No newline at end of file diff --git a/hosts/solterra/users/artur/configs/mako/config b/hosts/solterra/users/artur/configs/mako/config deleted file mode 100644 index 085be42..0000000 --- a/hosts/solterra/users/artur/configs/mako/config +++ /dev/null @@ -1,7 +0,0 @@ -font=monospace 15 -width=450 -height=220 -text-color=#f8f8f2ff -background-color=#282a36ff -border-color=#80bfffff -border-size=1 \ No newline at end of file diff --git a/hosts/solterra/users/artur/configs/qutebrowser/config.py b/hosts/solterra/users/artur/configs/qutebrowser/config.py deleted file mode 100644 index 796e908..0000000 --- a/hosts/solterra/users/artur/configs/qutebrowser/config.py +++ /dev/null @@ -1,37 +0,0 @@ -from theme import load_theme - -config.load_autoconfig() - -dracula = { - "base00": "#282a36", - "base01": "#363447", - "base02": "#44475a", - "base03": "#6272a4", - "base04": "#9ea8c7", - "base05": "#f8f8f2", - "base06": "#f0f1f4", - "base07": "#ffffff", - "base08": "#ff5555", - "base09": "#ffb86c", - "base0A": "#f1fa8c", - "base0B": "#50fa7b", - "base0C": "#8be9fd", - "base0D": "#80bfff", - "base0E": "#ff79c6", - "base0F": "#bd93f9", -} - -load_theme(c, dracula) - -c.colors.webpage.preferred_color_scheme = "dark" -c.tabs.position = "top" -c.tabs.width = 32 -c.fonts.default_size = "13pt" -c.fonts.default_family = "sans-serif" -c.tabs.padding = { - "bottom": 4, - "top": 4, - "left": 6, - "right": 6, -} -c.tabs.indicator.width = 0 diff --git a/hosts/solterra/users/artur/configs/rofi/config.rasi b/hosts/solterra/users/artur/configs/rofi/config.rasi deleted file mode 100644 index 0331d4e..0000000 --- a/hosts/solterra/users/artur/configs/rofi/config.rasi +++ /dev/null @@ -1,98 +0,0 @@ -configuration{ - modi: "run,drun,window"; - lines: 5; - font: "Iosevka 12"; - show-icons: true; - icon-theme: "Paper Mono"; - terminal: "st"; - drun-display-format: "{icon} {name}"; - location: 0; - disable-history: false; - hide-scrollbar: true; - display-drun: "  Apps "; -} - -@theme "base16" - -element-text, element-icon , mode-switcher { - background-color: inherit; - text-color: inherit; -} - -window { - height: 360px; - border: 3px; - border-color: @border-col; - background-color: @bg-col; -} - -mainbox { - background-color: @bg-col; -} - -inputbar { - children: [prompt,entry]; - background-color: @bg-col; - border-radius: 5px; - padding: 2px; -} - -prompt { - background-color: @blue; - padding: 6px; - text-color: @bg-col; - border-radius: 3px; - margin: 20px 0px 0px 20px; -} - -textbox-prompt-colon { - expand: false; - str: ":"; -} - -entry { - padding: 6px; - margin: 20px 0px 0px 10px; - text-color: @fg-col; - background-color: @bg-col; -} - -listview { - border: 0px 0px 0px; - padding: 6px 0px 0px; - margin: 10px 0px 0px 20px; - columns: 2; - background-color: @bg-col; -} - -element { - padding: 5px; - background-color: @bg-col; - text-color: @fg-col ; -} - -element-icon { - size: 25px; -} - -element selected { - background-color: @selected-col ; - text-color: @fg-col2 ; -} - -mode-switcher { - spacing: 0; - } - -button { - padding: 10px; - background-color: @bg-col-light; - text-color: @grey; - vertical-align: 0.5; - horizontal-align: 0.5; -} - -button selected { - background-color: @bg-col; - text-color: @blue; -} \ No newline at end of file diff --git a/hosts/solterra/users/artur/configs/rofi/themes/base16.rasi b/hosts/solterra/users/artur/configs/rofi/themes/base16.rasi deleted file mode 100644 index db1c13b..0000000 --- a/hosts/solterra/users/artur/configs/rofi/themes/base16.rasi +++ /dev/null @@ -1,11 +0,0 @@ -* { - bg-col: #282a36; - bg-col-light: #44475a; - border-col: #44475a; - selected-col: #44475a; - blue: #bd93f9; - fg-col: #f8f8f2; - fg-col2: #f8f8f2; - grey: #6272a4; - width: 600; -} diff --git a/hosts/solterra/users/artur/configs/waybar/style.css b/hosts/solterra/users/artur/configs/waybar/style.css deleted file mode 100644 index 005de51..0000000 --- a/hosts/solterra/users/artur/configs/waybar/style.css +++ /dev/null @@ -1,37 +0,0 @@ -@define-color base00 #282a36; -@define-color base01 #363447; -@define-color base02 #44475a; -@define-color base03 #6272a4; -@define-color base04 #9ea8c7; -@define-color base05 #f8f8f2; -@define-color base06 #f0f1f4; -@define-color base07 #ffffff; -@define-color base08 #ff5555; -@define-color base09 #ffb86c; -@define-color base0A #f1fa8c; -@define-color base0B #50fa7b; -@define-color base0C #8be9fd; -@define-color base0D #80bfff; -@define-color base0E #ff79c6; -@define-color base0F #bd93f9; - -* { - font-family: monospace; - font-size: 17px; - border-radius: 0px; - border: none; -} - -window#waybar { - background: @base00; -} - -.modules-right, -.modules-left { - padding: 0px 10px; -} - -#custom-nixos { - color: @base0D; - font-size: 24px; -} diff --git a/shells/default.nix b/shells/default.nix index 196b0fd..77cacfa 100644 --- a/shells/default.nix +++ b/shells/default.nix @@ -61,6 +61,6 @@ }; }; }; - formatter = pkgs.alejandra; + formatter = pkgs.nixfmt-rfc-style; }; }