From d10c73135464cd80adea5e69dfefcac001099eb2 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Tue, 30 Sep 2025 09:51:42 +0200 Subject: [PATCH 1/4] better colorscheme --- home-manager/dotfiles/mako/config | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/dotfiles/mako/config b/home-manager/dotfiles/mako/config index b2048ba..d1120b8 100644 --- a/home-manager/dotfiles/mako/config +++ b/home-manager/dotfiles/mako/config @@ -6,10 +6,10 @@ border-radius=12 # Colors -background-color=#eff1f5 -text-color=#4c4f69 -border-color=#8839ef -progress-color=over #ccd0da +background-color=#1e1e2e +text-color=#cdd6f4 +border-color=#cba6f7 +progress-color=over #313244 [urgency=high] -border-color=#fe640b +border-color=#fab387 From a51a4b7d8cecef7fe1486f8799f8ffc974d80519 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Tue, 30 Sep 2025 09:52:02 +0200 Subject: [PATCH 2/4] better ux for buldak --- home-manager/dotfiles/niri/config.kdl | 3 +- home-manager/dotfiles/waybar/config.jsonc | 11 +++-- home-manager/dotfiles/waybar/style.css | 9 +++- home-manager/home.nix | 55 ++++++++++++----------- hosts/buldak/configuration.nix | 10 ++++- hosts/buldak/features/software.nix | 1 + 6 files changed, 54 insertions(+), 35 deletions(-) diff --git a/home-manager/dotfiles/niri/config.kdl b/home-manager/dotfiles/niri/config.kdl index fa82ce4..9437258 100644 --- a/home-manager/dotfiles/niri/config.kdl +++ b/home-manager/dotfiles/niri/config.kdl @@ -571,6 +571,7 @@ binds { // wayland support spawn-at-startup "xwayland-satellite" +spawn-at-startup "poweralertd" spawn-at-startup "swww-daemon" spawn-at-startup "~/config/niri/start-bg.sh" @@ -581,7 +582,7 @@ environment { // apps to launch at startup spawn-at-startup "discord" spawn-at-startup "footclient" "nvim" "~/Documents/Notes" -spawn-at-startup "cider" +spawn-at-startup "cider-2" clipboard { disable-primary diff --git a/home-manager/dotfiles/waybar/config.jsonc b/home-manager/dotfiles/waybar/config.jsonc index f1a063b..c460262 100644 --- a/home-manager/dotfiles/waybar/config.jsonc +++ b/home-manager/dotfiles/waybar/config.jsonc @@ -23,8 +23,7 @@ "scroll-step": 0.2 }, "privacy": { - "icon-spacing": 4, - "icon-size": 18, + "icon-spacing": 4, "icon-size": 18, "transition-duration": 250, "modules": [ { @@ -43,7 +42,7 @@ "format": "{}%  " }, "network": { - "interface": "wlp3s0", + "interface": "wlo1", "format": "{ifname}", "format-wifi": " ", "format-ethernet": "󰈀", @@ -77,7 +76,7 @@ "exec-if": "which swaync-client", "exec": "swaync-client -swb", "on-click": "swaync-client -t -sw", - "on-click-right": "swaync-client -d -sw", + "escape": true }, "tray": { @@ -89,7 +88,7 @@ "warning": 20, "critical": 10 }, - "format": "{capacity}% {icon}" - "format-icons": ["", "", "", "", ""], + "format": "{capacity}% {icon}", + "format-icons": ["", "", "", "", ""] } } diff --git a/home-manager/dotfiles/waybar/style.css b/home-manager/dotfiles/waybar/style.css index 9d77e90..f692454 100644 --- a/home-manager/dotfiles/waybar/style.css +++ b/home-manager/dotfiles/waybar/style.css @@ -56,8 +56,8 @@ #workspaces button { border-radius: 0; - padding-left: 3px; - padding-right: 3px; + padding-left: 8px; + padding-right: 8px; } #bluetooth { @@ -109,6 +109,11 @@ margin-right: 16px; } +#battery { + border-radius: 12px; + margin-right: 16px; +} + #window { margin-left: 16px; background-color: @surface0; diff --git a/home-manager/home.nix b/home-manager/home.nix index 909ec27..e7ec9e6 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,4 +1,5 @@ { + inputs, config, pkgs, ... @@ -23,6 +24,7 @@ home.packages = with pkgs; [ + forgejo-cli yt-dlp nerd-fonts.code-new-roman ffmpegthumbnailer @@ -88,6 +90,8 @@ nvimpager mpc fastfetch + matugen + # # You can also create simple shell scripts directly inside your # # configuration. For example, this adds a command 'my-hello' to your # # environment: @@ -114,31 +118,31 @@ ".config/mako".source = dotfiles/mako; }; - programs.matugen = { - enable = true; - variant = "dark"; - - config = { - wallpaper = { - command = "swww"; - arguments = [ - "img" - "--transition-type" - "center" - ]; - set = true; - }; - }; - - templates = { - waybar = { - input_path = "./templates/colors.css"; - output_path = "~/.config/waybar/colors.css"; - post_hook = "pkill -SIGUSR2 waybar"; - }; - }; - }; - + # programs.matugen = { + # enable = true; + # variant = "dark"; + # + # config = { + # wallpaper = { + # command = "swww"; + # arguments = [ + # "img" + # "--transition-type" + # "center" + # ]; + # set = true; + # }; + # }; + # + # templates = { + # waybar = { + # input_path = "./templates/colors.css"; + # output_path = "~/.config/waybar/colors.css"; + # post_hook = "pkill -SIGUSR2 waybar"; + # }; + # }; + # }; + # programs.direnv = { enable = true; enableBashIntegration = true; # see note on other shells below @@ -332,6 +336,7 @@ gpsh = "git push"; flake = "nix flake"; develop = "nix develop"; + fj = "fj --host git.rougebordeaux.xyz"; }; history.size = 10000; diff --git a/hosts/buldak/configuration.nix b/hosts/buldak/configuration.nix index 943f438..9e95bd9 100644 --- a/hosts/buldak/configuration.nix +++ b/hosts/buldak/configuration.nix @@ -52,7 +52,7 @@ boot.initrd.luks.devices."luks-d265e9b2-2ef5-445a-83f2-ec022e0eec7b".device = "/dev/disk/by-uuid/d265e9b2-2ef5-445a-83f2-ec022e0eec7b"; networking.hostName = "buldak"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # Enable networking networking.networkmanager.enable = true; @@ -111,9 +111,17 @@ # $ nix search wget environment.systemPackages = with pkgs; [ poweralertd + upower matugen + networkmanagerapplet ]; + services.upower = { + enable = true; + percentageLow = 20; + percentageCritical = 10; + percentageAction = 5; + }; nixpkgs.config.permittedInsecurePackages = [ "libsoup-2.74.3" ]; diff --git a/hosts/buldak/features/software.nix b/hosts/buldak/features/software.nix index 138d144..25b35e7 100644 --- a/hosts/buldak/features/software.nix +++ b/hosts/buldak/features/software.nix @@ -10,6 +10,7 @@ cider-2 iamb qutebrowser + ente-desktop ]; virtualisation.containers.enable = true; From 0e1b49a4a7dc681ae3f6955c42e68401e72022b0 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Tue, 30 Sep 2025 12:42:05 +0200 Subject: [PATCH 3/4] bumped miovim --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index f2474ed..29524a6 100644 --- a/flake.lock +++ b/flake.lock @@ -383,11 +383,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1753435585, - "narHash": "sha256-RP5gyJlkvZYE67ZFh92X/Y43KiAoe6PENEVLolNriYM=", + "lastModified": 1759228895, + "narHash": "sha256-9Ft4D1DFjSBSPd6OB3mRRQeF6epF4nlZBAvDKcZDjNw=", "ref": "refs/heads/main", - "rev": "05ad03cb362b42b9c6e463864a90fbeea06c93ba", - "revCount": 27, + "rev": "3283a7f9e1f33c0c0d91718754cfc42c47d925e0", + "revCount": 28, "type": "git", "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" }, From 1ec09c057147a09e1e3d26c9ef1897122cd80f49 Mon Sep 17 00:00:00 2001 From: misschloe777 Date: Tue, 30 Sep 2025 12:42:17 +0200 Subject: [PATCH 4/4] small sisyphe update --- hosts/sisyphe/configuration.nix | 7 ++++ hosts/sisyphe/features/authentik.nix | 40 ------------------- hosts/sisyphe/features/containers/4get.nix | 16 -------- hosts/sisyphe/features/fail2ban.nix | 6 --- .../sisyphe/features/services/irc-server.nix | 21 ---------- 5 files changed, 7 insertions(+), 83 deletions(-) delete mode 100644 hosts/sisyphe/features/authentik.nix delete mode 100644 hosts/sisyphe/features/containers/4get.nix delete mode 100644 hosts/sisyphe/features/services/irc-server.nix diff --git a/hosts/sisyphe/configuration.nix b/hosts/sisyphe/configuration.nix index 9bc6395..c512d52 100644 --- a/hosts/sisyphe/configuration.nix +++ b/hosts/sisyphe/configuration.nix @@ -21,6 +21,8 @@ in # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; + + # Support for xterm.js in Proxmox boot.kernelParams = [ "console=ttyS0" ]; services.qemuGuest.enable = true; @@ -123,6 +125,11 @@ in "unrar" ]; + # log shouldnt eat all my hard drive + services.logrotate = { + enable = true; + }; + # This option defines the first version of NixOS you have installed on this particular machine, # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. # diff --git a/hosts/sisyphe/features/authentik.nix b/hosts/sisyphe/features/authentik.nix deleted file mode 100644 index 249b04a..0000000 --- a/hosts/sisyphe/features/authentik.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ config, ... }: -let - authentik-version = "2024.6.1"; - authentik-nix-src = builtins.fetchTarball { - url = "https://github.com/nix-community/authentik-nix/archive/version/${authentik-version}.tar.gz"; - sha256 = "10ss29nzifyrq44080mjqa6xl6qw9mz755xcrla3kjxjl7d0mvlz"; - }; - authentik-nix = import authentik-nix-src; - cfg = config.authentik; -in -{ - imports = [ authentik-nix.nixosModules.default ]; - sops.secrets."authentik" = { - sopsFile = ../secrets/authentik.env; - format = "dotenv"; - }; - - /* - sops.secrets.mail-server = { - sopsFile = ./secrets/mail.json; - format = "json"; - }; - */ - - services.authentik = { - enable = true; - environmentFile = config.sops.secrets."authentik".path; - settings = { - /* - email = { - host = config.sops.secrets.mail-server."host"; - username = config.sops.secrets.mail-server."username"; - }; - */ - - disable_startup_analytics = true; - avatars = "initials"; - }; - }; -} diff --git a/hosts/sisyphe/features/containers/4get.nix b/hosts/sisyphe/features/containers/4get.nix deleted file mode 100644 index 2b0afd8..0000000 --- a/hosts/sisyphe/features/containers/4get.nix +++ /dev/null @@ -1,16 +0,0 @@ -{config, ...}: -{ - virtualisation.oci-containers = { - backend = "docker"; - containers = { - fourget = { - image = "luuul/4get:latest"; - environment = { - "FOURGET_PROTO" = "http"; - "FOURGET_SERVER_NAME" = "192.168.1.177:6942"; - }; - ports = ["6942:80"]; - }; - }; - }; -} diff --git a/hosts/sisyphe/features/fail2ban.nix b/hosts/sisyphe/features/fail2ban.nix index a1ef011..48bd774 100644 --- a/hosts/sisyphe/features/fail2ban.nix +++ b/hosts/sisyphe/features/fail2ban.nix @@ -13,12 +13,6 @@ ''; */ }; - sshd = '' - enabled = true - port = ssh - logpath = %(sshd_log)s - backend = %(sshd_backend)s - ''; }; environment.etc = { diff --git a/hosts/sisyphe/features/services/irc-server.nix b/hosts/sisyphe/features/services/irc-server.nix deleted file mode 100644 index 1533af3..0000000 --- a/hosts/sisyphe/features/services/irc-server.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ ircdHybrid ]; - - services.ircdHybrid = { - enable = false; - serverName = "irc.rougebordeaux.xyz"; - description = "welcome to the silly kittens hut !! meow:3"; - adminEmail = "admin@rougebordeaux.xyz"; - }; - - /** - environment.etc = { - "ircd.conf" = { - text ='' - ''; - mode = "440"; - }; - };* - */ -}