End of NixOS container era

6 files changed, 47 insertions, 34 deletions

diff --git a/nix/programs/bash.nix b/nix/programs/bash.nix
index 4fb9cd3..571b4fe 100644
--- a/nix/programs/bash.nix
+++ b/nix/programs/bash.nix
@@ -47,6 +47,7 @@
         NORMAL="\001\033[0m\002"
         YELLOW="\001\033[0;33m\002"
         BLUE="\001\033[0;34m\002"
+        MAGENTA="\001\033[0;35m\002"
         CYAN="\001\033[0;36m\002"
         RED="\001\033[0;31m\002"
         exit_code_guy()
@@ -57,7 +58,7 @@
             printf "(″ロ゛) >"
           fi
         }
-        export PS1="$RESET$BLUE\u@$CYAN\H$BLUE:\w\$(exit_code_guy)$NORMAL "
+        export PS1="$RESET$MAGENTA\u@$CYAN\H$MAGENTA:\w\$(exit_code_guy)$NORMAL "
       '';
     };
   };
diff --git a/nix/programs/firefox.nix b/nix/programs/firefox.nix
index fd10f99..9364d29 100644
--- a/nix/programs/firefox.nix
+++ b/nix/programs/firefox.nix
@@ -19,8 +19,8 @@ in {
       source = (pkgs.fetchFromGitHub {
         owner = "rafaelmardojai";
         repo = "firefox-gnome-theme";
-        rev = "6b2061ac6faf5dfb52d5b41dca98fa0c022b2b91";
-        hash = "sha256-c3oiw6RysUVxRqkv39gxhiO1WjfvuEzZw4PemN0C7Kk=";
+        rev = "4eb2714fbed2b80e234312611a947d6cb7d70caf";
+        hash = "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=";
       });
     };
     home.file."customChrome.css" = {
diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix
index 74b6c6a..f3c11a4 100644
--- a/nix/programs/kitty.nix
+++ b/nix/programs/kitty.nix
@@ -28,11 +28,13 @@ in {
         initial_window_width 720
         initial_window_height 480
         resize_debounce_time 0.025 0.5
+        window_padding_width 1
         placement_strategy top-left
         scrollback_lines 3000
         paste_actions confirm,confirm-if-large
         disable_ligatures always
         modify_font baseline ${toString loc.font.baseline}
+        modify_font cell_height ${toString loc.font.cell-height-offset}
         cursor_shape block
         #cursor_blink_interval -1 linear ease-out
         #cursor_stop_blinking_after 20.0
diff --git a/nix/programs/nvim.nix b/nix/programs/nvim.nix
index b12ad52..3cdf12e 100644
--- a/nix/programs/nvim.nix
+++ b/nix/programs/nvim.nix
@@ -43,10 +43,10 @@ let
       hi Added                guifg=#${colo.color2}
       hi Changed              guifg=#${colo.color3}
       hi ColorColumn                                    guibg=#${colo.color6}
-      hi Conceal              guifg=#${colo.color6}
+      hi Conceal              guifg=#${colo.color5}
       hi CurSearch            guifg=#${colo.background} guibg=#${colo.color4}
       hi CursorColumn                                   guibg=#${colo.background}
-      hi CursorLine                                     guibg=#${colo.color4}
+      hi CursorLine                                     guibg=#${colo.color5}
       hi DiffAdd              guifg=#${colo.color2}     guibg=#${colo.background}
       hi DiffChange           guifg=#${colo.color3}     guibg=#${colo.background}
       hi DiffDelete           guifg=#${colo.color1}     guibg=#${colo.background} gui=bold
@@ -56,23 +56,23 @@ let
       hi FloatShadow                                    guibg=#${colo.color6}     blend=80
       hi FloatShadowThrough                             guibg=#${colo.color6}     blend=100
       hi Folded               guifg=#${colo.color5}     guibg=#${colo.background}
-      hi LineNr               guifg=#${colo.color6}
-      hi MatchParen           guifg=#${colo.color6}     guibg=#${colo.background} gui=bold
+      hi LineNr               guifg=#${colo.color2}
+      hi MatchParen           guifg=#${colo.color2}     guibg=#${colo.background} gui=bold
       hi ModeMsg              guifg=#${colo.color4}
       hi MoreMsg              guifg=#${colo.color2}
       hi NonText              guifg=#${colo.color6}
-      hi NormalFloat                                    guibg=#${colo.color4}
-      hi Pmenu                                          guibg=#${colo.color4}
-      hi PmenuThumb                                     guibg=#${colo.color5}
-      hi PmenuSel                                       guibg=#${colo.color4} " Font color.
-      hi PmenuSbar                                      guibg=#${colo.color4}
+      hi NormalFloat                                    guibg=#${colo.color5}
+      hi Pmenu                                          guibg=#${colo.color5}
+      hi PmenuThumb                                     guibg=#${colo.color4}
+      hi PmenuSel                                       guibg=#${colo.color5} " Font color.
+      hi PmenuSbar                                      guibg=#${colo.color5}
       hi Question             guifg=#${colo.color3}
       hi QuickFixLine         guifg=#${colo.color3}
       hi RedrawDebugClear                               guibg=#${colo.color2}
       hi RedrawDebugComposed                            guibg=#${colo.background}
       hi RedrawDebugRecompose                           guibg=#${colo.color3}
       hi Removed              guifg=#${colo.color1}
-      hi Search               guifg=#${colo.foreground} guibg=#${colo.color3}
+      hi Search               guifg=#${colo.foreground} guibg=#${colo.color1}
       hi SignColumn           guifg=#${colo.color6}
       hi SpecialKey           guifg=#${colo.color6}
       hi SpellBad             guisp=#${colo.color1}                               gui=undercurl
@@ -181,6 +181,7 @@ in {
             starter.gen_hook.aligning('center', 'center')
           },
           top_padding = ${toString s.top_padding},
+          header = '${s.header}',
           footer = '${s.footer}',
           footer_offset = ${toString s.footer-offset},
           picture = {
diff --git a/nix/programs/sunshine.nix b/nix/programs/sunshine.nix
index 6820f06..dff4d97 100644
--- a/nix/programs/sunshine.nix
+++ b/nix/programs/sunshine.nix
@@ -1,5 +1,5 @@
 { pkgs, ... }: {
-#  environment.systemPackages = with pkgs; [ sunshine ];
+  #environment.systemPackages = with pkgs; [ sunshine ];
   services.sunshine = {
     enable = true;
     capSysAdmin = true;
@@ -18,12 +18,12 @@
       ];
     };
   };
-#  security.wrappers = {
-#    sunshine = {
-#      owner = "root";
-#      group = "root";
-#      source = "${pkgs.sunshine}/bin/sunshine";
-#      capabilities = "cap_sys_admin+p";
-#    };
-#  };
+  #security.wrappers = {
+  #  sunshine = {
+  #    owner = "root";
+  #    group = "root";
+  #    source = "${pkgs.sunshine}/bin/sunshine";
+  #    capabilities = "cap_sys_admin+p";
+  #  };
+  #};
 }
diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix
index 84fa903..07f8d2c 100644
--- a/nix/programs/sway.nix
+++ b/nix/programs/sway.nix
@@ -6,6 +6,7 @@ in {
   services.xserver.videoDrivers = [ "modesetting" ];
   programs.sway = {
     enable = true;
+    package = pkgs.swayfx;
     extraPackages = with pkgs; [
       libinput
       swaybg
@@ -40,17 +41,17 @@ in {
     extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
   };
   xdg.icons.enable = true;
-#  services.getty.autologinUser = "andrew";
-#  services.greetd = {
-#    enable = false;
-#    settings = {
-#      vt=3;
-#      default_session = {
-#        command = "run-sway";
-#        user = "root";
-#      };
-#    };
-#  };
+  #services.getty.autologinUser = "andrew";
+  #services.greetd = {
+  #  enable = false;
+  #  settings = {
+  #    vt=3;
+  #    default_session = {
+  #      command = "run-sway";
+  #      user = "root";
+  #    };
+  #  };
+  #};
   qt = {
     enable = true;
     platformTheme = "qt5ct"; # Also selects qt6ct.
@@ -284,7 +285,7 @@ in {
           commands = [
             { command = "move to scratchpad"; criteria.app_id = "kitty-server"; }
             { command = "allow_tearing yes"; criteria.app_id = "kitty"; }
-            { command = "inhibit_idle fullscreen; floating enable; allow_tearing yes"; criteria.app_id = "cmv"; }
+            { command = "inhibit_idle fullscreen; floating enable"; criteria.app_id = "cmv"; }
             { command = "floating enable"; criteria.class = "cmv.exe"; }
             { command = "floating enable"; criteria.app_id = "mauri"; }
             { command = "inhibit_idle fullscreen"; criteria.title = "Parsec"; }
@@ -298,6 +299,7 @@ in {
             { command = "inhibit_idle fullscreen; allow_tearing yes"; criteria.title = "Overwatch"; }
             { command = "inhibit_idle fullscreen"; criteria.class = "Ryujinx"; }
             { command = "inhibit_idle fullscreen"; criteria.app_id = "org.yuzu_emu.yuzu"; }
+            { command = "inhibit_idle fullscreen"; criteria.app_id = "info.cemu.Cemu"; }
             { command = "inhibit_idle fullscreen"; criteria.class = "dolphin-emu"; }
             { command = "inhibit_idle fullscreen"; criteria.class = "AppRun"; } # Ishiiruka-Dolphin
             { command = "inhibit_idle fullscreen"; criteria.class = "SuperMeatBoy"; }
@@ -326,6 +328,13 @@ in {
           { command = "wlsunset-toggle"; }
         ];
       };
+      extraConfig = ''
+        blur enable
+        blur_passes 4
+        blur_radius 2
+        blur_contrast 1.5
+        blur_saturation 1.1
+      '';
     };
     services.swayidle = {
       enable = true;