more niri related config

flake.nix

@@ -109,7 +109,7 @@
               home-manager.users.${username} = {
                 imports = [
                   ./home-manager/home.nix
-                  catppuccin.homeManagerModules.catppuccin
+                  catppuccin.homeModules.catppuccin
                 ];
               };
               home-manager.extraSpecialArgs = { inherit inputs; };

home-manager/dotfiles/niri/config.kdl

@@ -149,7 +149,7 @@ layout {
         // off
 
         // How many logical pixels the ring extends out from the windows.
-        width 4
+        width 2
 
         // Colors can be set in a variety of ways:
         // - CSS named colors: "red"
@@ -157,7 +157,7 @@ layout {
         // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others.
 
         // Color of the ring on the active monitor.
-        active-color "#7fc8ff"
+        active-color "#7287fd"
 
         // Color of the ring on inactive monitors.
         inactive-color "#505050"
@@ -295,6 +295,7 @@ window-rule {
     // - Flatpak Firefox (app-id is "org.mozilla.firefox")
     match app-id=r#"firefox$"# title="^Picture-in-Picture$"
     match app-id=r#"zen$"# title="^Picture-in-Picture$"
+    match app-id=r#"zen-beta$"# title="^Picture-in-Picture$"
     open-floating true
 }
 
@@ -303,6 +304,7 @@ window-rule {
 window-rule {
     match app-id=r#"^org\.keepassxc\.KeePassXC$"#
     match app-id=r#"^org\.gnome\.World\.Secrets$"#
+    match app-id=r#"Bitwarden"#
 
     block-out-from "screen-capture"
 
@@ -333,7 +335,7 @@ binds {
     Mod+Shift+Slash { show-hotkey-overlay; }
 
     // Suggested binds for running programs: terminal, app launcher, screen locker.
-    Mod+Return { spawn "foot"; }
+    Mod+Return { spawn "footclient"; }
     Mod+D { spawn "fuzzel"; }
     Super+Alt+L { spawn "swaylock"; }
 
@@ -573,3 +575,28 @@ spawn-at-startup "xwayland-satellite"
 environment {
   DISPLAY ":0"
 }
+
+// apps to launch at startup
+spawn-at-startup "zen-beta"
+spawn-at-startup "obsidian"
+spawn-at-startup "discord"
+spawn-at-startup "beeper"
+
+clipboard {
+  disable-primary
+}
+
+workspace "code"
+workspace "internet"
+workspace "chat"
+
+window-rule {
+  match at-startup=true app-id=r#"^discord$"#
+  match at-startup=true app-id=r#"^Beeper$"#
+  open-on-workspace "chat"
+}
+
+window-rule {
+  match at-startup=true app-id=r#"zen-beta$"#
+  open-on-workspace "internet"
+}

home-manager/dotfiles/waybar/config.jsonc

@@ -1,6 +1,6 @@
 {
   "layer": "top",
-  "modules-left": ["custom/launcher", "niri/workspaces"],
+  "modules-left": ["custom/launcher", "niri/workspaces", "niri/window"],
   "modules-center": [],
   "modules-right": [
     "tray",
@@ -46,7 +46,7 @@
     "format-wifi": " ",
     "format-ethernet": "󰈀",
     "format-disconnected": "", //An empty format will hide the module.
-    "tooltip-format": "{ifname} via {gwaddr} 󰈀",
+    "tooltip-format": "{ifname} via {gwaddr} 󰈀 ",
     "tooltip-format-wifi": "{essid} ({signalStrength}%)  ",
     "tooltip-format-ethernet": "{ifname}  ",
     "tooltip-format-disconnected": "Disconnected",
@@ -77,5 +77,8 @@
     "on-click": "swaync-client -t -sw",
     "on-click-right": "swaync-client -d -sw",
     "escape": true
+  },
+  "tray": {
+    "spacing": 10
   }
 }

home-manager/dotfiles/waybar/style.css

@@ -10,16 +10,15 @@
   text-shadow: none;
   transition: none;
   box-shadow: none;
-  font-family: "DM Sans", "CodeNewRoman Nerd Font", sans-serif;
   font-weight: bold;
   font-size: 12px;
-  color: @text;
 }
 
-window#waybar {
+#waybar {
-  background-color: @base;
+  font-family: "DM Sans", "CodeNewRoman Nerd Font", sans-serif;
-  padding-right: 12px;
+  padding: 4px 8px;
-  /*border: solid 2px @primary;*/
+  background-color: transparent;
+  border-radius: 12px;
   min-height: 14px; /* set waybar's height to 14px */
   font-size: 14px; /* set only the font size to be bigger, which in turn will adjust the height of other elements */
 }
@@ -28,8 +27,14 @@ window#waybar {
 #battery,
 #cpu,
 #wireplumber,
-#bluetooth {
+#bluetooth,
-  padding: 0 12px;
+#network {
+  padding: 4px 12px;
+  background-color: @surface0;
+  color: @text;
+}
+
+#clock {
 }
 
 #workspaces button {
@@ -39,14 +44,20 @@ window#waybar {
 #workspaces button:hover {
   box-shadow: inherit;
   text-shadow: inherit;
+  background-color: @surface1;
+  border-radius: 12px;
 }
 
 #workspaces button.focused {
-  background-color: #000;
+  background-color: @surface1;
   color: #fff;
+  border-radius: 12px;
 }
 
 #workspaces {
+  background-color: @surface0;
+  padding: 2px 4px;
+  border-radius: 12px;
 }
 
 #privacy-item.screenshare {
@@ -58,3 +69,28 @@ window#waybar {
   color: #000;
   background-color: #ffae42;
 }
+
+#network {
+  border-radius: 12px 0 0 12px;
+}
+
+#clock {
+  border-radius: 0 12px 12px 0;
+}
+
+#tray {
+  background-color: @surface0;
+  border-radius: 12px;
+  padding: 2px 4px;
+  margin-right: 16px;
+}
+
+#window {
+  margin-left: 16px;
+  background-color: @surface0;
+  font-family: "light";
+
+  border-radius: 12px;
+  padding: 2px 4px;
+  color: @text;
+}

home-manager/home.nix

@@ -24,92 +24,85 @@
   # release notes.
   home.stateVersion = "24.05"; # Please read the comment before changing.
 
-  nixpkgs.config.allowUnfreePredicate =
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "vscode"
-      "tetrio-desktop"
-      "beeper"
-    ];
-
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages =
+  home.packages = with pkgs; [
-    with pkgs;
+    # # Adds the 'hello' command to your environment. It prints a friendly
-    [
+    # # "Hello, world!" when run.
-      # # Adds the 'hello' command to your environment. It prints a friendly
+    # pkgs.hello
-      # # "Hello, world!" when run.
-      # pkgs.hello
 
-      beeper
+    beeper
-      nerd-fonts.code-new-roman
+    nerd-fonts.code-new-roman
-      ffmpegthumbnailer
+    ffmpegthumbnailer
-      xfce.tumbler
+    xfce.tumbler
-      dm-sans
+    dm-sans
-      zoxide
+    zoxide
-      btop
+    btop
-      bitwarden-cli
+    bitwarden-cli
-      weechat
+    weechat
-      cava
+    cava
-      hyfetch
+    hyfetch
-      kittysay
+    kittysay
-      nextcloud-client
+    nextcloud-client
-      thunderbird-bin
+    thunderbird-bin
-      feh
+    feh
-      waybar
+    waybar
-      p7zip
+    p7zip
 
-      libreoffice-qt
+    libreoffice-qt
-      tetrio-desktop
+    tetrio-desktop
 
-      playerctl
+    playerctl
-      wf-recorder
+    wf-recorder
 
-      file
+    file
-      osu-lazer-bin
+    osu-lazer-bin
 
-      qbittorrent
+    qbittorrent
 
-      i2pd
+    i2pd
-      ripgrep
+    ripgrep
-      vscode
+    vscode
 
-      zathura
+    zathura
-      tor-browser
+    tor-browser
 
-      gammastep
+    gammastep
-      lazygit
+    lazygit
-      gimp-with-plugins
+    gimp-with-plugins
-      fzf
+    fzf
-      lf
+    lf
-      why3
-      alt-ergo
-      cvc4
-      z3
-      prismlauncher
 
-      wofi
+    prismlauncher
-      wofi-emoji
-      obsidian
 
-      audacious
+    wofi
-      audacious-plugins
+    wofi-emoji
+    obsidian
 
-      libsixel
+    audacious
-      unzip
+    audacious-plugins
-      p7zip
 
-      libsixel
+    libsixel
-      unzip
+    unzip
-      p7zip
+    p7zip
 
-      nixfmt-rfc-style
+    libsixel
-      fuzzel
+    unzip
-      zsh-syntax-highlighting
+    p7zip
-    ]
+
-    ++ lib.optionals pkgs.stdenv.isLinux [
+    nixfmt-rfc-style
-      kdePackages.dolphin
+    fuzzel
-    ];
+    zsh-syntax-highlighting
+
+    obsidian
+    papirus-icon-theme
+    # # You can also create simple shell scripts directly inside your
+    #  # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+  ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
@@ -137,11 +130,13 @@
   programs.direnv = {
     enable = true;
     enableBashIntegration = true; # see note on other shells below
+    enableZshIntegration = true;
     nix-direnv.enable = true;
   };
 
   programs.zoxide.enable = true;
   programs.zoxide.enableBashIntegration = true;
+  programs.zoxide.enableZshIntegration = true;
   programs.zoxide.options = [
     "--cmd cd"
   ];
@@ -230,6 +225,14 @@
     };
   */
 
+  gtk.iconTheme = {
+    package = pkgs.papirus-icon-theme;
+  };
+
+  gtk.theme = {
+    package = pkgs.catppuccin-gtk;
+  };
+
   programs.foot = {
     enable = true;
     server.enable = true;
@@ -245,6 +248,8 @@
     swaylock.enable = true;
   };
 
+  home.shell.enableZshIntegration = true;
+
   programs.zsh = {
     enable = true;
     enableCompletion = true;
@@ -265,6 +270,19 @@
       "pkill *"
       "cp *"
     ];
+
+    plugins = [
+      {
+        name = "vi-mode";
+        src = pkgs.zsh-vi-mode;
+        file = "share/zsh-vi-mode/zsh-vi-mode.plugin.zsh";
+      }
+      {
+        name = "powerlevel10k";
+        src = pkgs.zsh-powerlevel10k;
+        file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
+      }
+    ];
   };
 
   # Let Home Manager install and manage itself.

hosts/goober/configuration.nix

@@ -65,7 +65,7 @@
     "flakes"
   ];
   # Configure keymap in X11
-  # services.xserver.xkb.layout = "us";
+  services.xserver.xkb.layout = "fr";
   # services.xserver.xkb.options = "eurosign:e,caps:escape";
 
   # Enable CUPS to print documents.
@@ -74,14 +74,19 @@
   # Enable touchpad support (enabled default in most desktopManager).
   # services.libinput.enable = true;
 
+  programs.zsh.enable = true;
+  environment.pathsToLink = [ "/share/zsh" ];
+
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.harry123 = {
     isNormalUser = true;
+    shell = pkgs.zsh;
     extraGroups = [
       "wheel"
       "audio"
       "video"
       "networkmanager"
+      "podman"
     ];
 
     packages = with pkgs; [

hosts/goober/features/software/workstation.nix

@@ -7,7 +7,11 @@
     pkg:
     builtins.elem (lib.getName pkg) [
       "davinci-resolve"
+      "vscode"
+      "tetrio-desktop"
+      "beeper"
     ];
+
   environment.systemPackages = with pkgs; [
     zathura
     # music editing software
@@ -40,5 +44,24 @@
     eclipses.eclipse-java # school wants us to use it...
     nil
     jetbrains.idea-ultimate
+
+    why3
+    alt-ergo
+    cvc4
+    z3
+    bitwarden
+    kicad
   ];
+
+  programs.kdeconnect.enable = true;
+  virtualisation.containers.enable = true;
+  virtualisation = {
+    podman = {
+      enable = true;
+      # Create a `docker` alias for podman, to use it as a drop-in replacement
+      dockerCompat = true;
+      # Required for containers under podman-compose to be able to talk to each other.
+      defaultNetwork.settings.dns_enabled = true;
+    };
+  };
 }