diff --git a/flake.lock b/flake.lock index 29524a6..f2474ed 100644 --- a/flake.lock +++ b/flake.lock @@ -383,11 +383,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1759228895, - "narHash": "sha256-9Ft4D1DFjSBSPd6OB3mRRQeF6epF4nlZBAvDKcZDjNw=", + "lastModified": 1753435585, + "narHash": "sha256-RP5gyJlkvZYE67ZFh92X/Y43KiAoe6PENEVLolNriYM=", "ref": "refs/heads/main", - "rev": "3283a7f9e1f33c0c0d91718754cfc42c47d925e0", - "revCount": 28, + "rev": "05ad03cb362b42b9c6e463864a90fbeea06c93ba", + "revCount": 27, "type": "git", "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" }, diff --git a/home-manager/dotfiles/mako/config b/home-manager/dotfiles/mako/config index d1120b8..b2048ba 100644 --- a/home-manager/dotfiles/mako/config +++ b/home-manager/dotfiles/mako/config @@ -6,10 +6,10 @@ border-radius=12 # Colors -background-color=#1e1e2e -text-color=#cdd6f4 -border-color=#cba6f7 -progress-color=over #313244 +background-color=#eff1f5 +text-color=#4c4f69 +border-color=#8839ef +progress-color=over #ccd0da [urgency=high] -border-color=#fab387 +border-color=#fe640b diff --git a/home-manager/dotfiles/niri/config.kdl b/home-manager/dotfiles/niri/config.kdl index 9437258..fa82ce4 100644 --- a/home-manager/dotfiles/niri/config.kdl +++ b/home-manager/dotfiles/niri/config.kdl @@ -571,7 +571,6 @@ 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" @@ -582,7 +581,7 @@ environment { // apps to launch at startup spawn-at-startup "discord" spawn-at-startup "footclient" "nvim" "~/Documents/Notes" -spawn-at-startup "cider-2" +spawn-at-startup "cider" clipboard { disable-primary diff --git a/home-manager/dotfiles/waybar/config.jsonc b/home-manager/dotfiles/waybar/config.jsonc index c460262..f1a063b 100644 --- a/home-manager/dotfiles/waybar/config.jsonc +++ b/home-manager/dotfiles/waybar/config.jsonc @@ -23,7 +23,8 @@ "scroll-step": 0.2 }, "privacy": { - "icon-spacing": 4, "icon-size": 18, + "icon-spacing": 4, + "icon-size": 18, "transition-duration": 250, "modules": [ { @@ -42,7 +43,7 @@ "format": "{}%  " }, "network": { - "interface": "wlo1", + "interface": "wlp3s0", "format": "{ifname}", "format-wifi": " ", "format-ethernet": "󰈀", @@ -76,7 +77,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": { @@ -88,7 +89,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 f692454..9d77e90 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: 8px; - padding-right: 8px; + padding-left: 3px; + padding-right: 3px; } #bluetooth { @@ -109,11 +109,6 @@ 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 e7ec9e6..909ec27 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -1,5 +1,4 @@ { - inputs, config, pkgs, ... @@ -24,7 +23,6 @@ home.packages = with pkgs; [ - forgejo-cli yt-dlp nerd-fonts.code-new-roman ffmpegthumbnailer @@ -90,8 +88,6 @@ 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: @@ -118,31 +114,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 @@ -336,7 +332,6 @@ 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 9e95bd9..943f438 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,17 +111,9 @@ # $ 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 25b35e7..138d144 100644 --- a/hosts/buldak/features/software.nix +++ b/hosts/buldak/features/software.nix @@ -10,7 +10,6 @@ cider-2 iamb qutebrowser - ente-desktop ]; virtualisation.containers.enable = true; diff --git a/hosts/sisyphe/configuration.nix b/hosts/sisyphe/configuration.nix index c512d52..9bc6395 100644 --- a/hosts/sisyphe/configuration.nix +++ b/hosts/sisyphe/configuration.nix @@ -21,8 +21,6 @@ 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; @@ -125,11 +123,6 @@ 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 new file mode 100644 index 0000000..249b04a --- /dev/null +++ b/hosts/sisyphe/features/authentik.nix @@ -0,0 +1,40 @@ +{ 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 new file mode 100644 index 0000000..2b0afd8 --- /dev/null +++ b/hosts/sisyphe/features/containers/4get.nix @@ -0,0 +1,16 @@ +{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 48bd774..a1ef011 100644 --- a/hosts/sisyphe/features/fail2ban.nix +++ b/hosts/sisyphe/features/fail2ban.nix @@ -13,6 +13,12 @@ ''; */ }; + 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 new file mode 100644 index 0000000..1533af3 --- /dev/null +++ b/hosts/sisyphe/features/services/irc-server.nix @@ -0,0 +1,21 @@ +{ 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"; + }; + };* + */ +}