update

10 files changed, 46 insertions, 61 deletions

diff --git a/flake.lock b/flake.lock
index 7c39734..8391127 100644
--- a/flake.lock
+++ b/flake.lock
@@ -163,11 +163,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747427366,
-        "narHash": "sha256-c3UfEsnT94bt6ta1VELYQhAWkQWFGlB+7DmBmthlGGg=",
+        "lastModified": 1747439237,
+        "narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "74d31e1165341bf510ee2017841a599f5cfc1608",
+        "rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708",
         "type": "github"
       },
       "original": {
diff --git a/form/home.nix b/form/home.nix
index 2dcae82..50c7668 100644
--- a/form/home.nix
+++ b/form/home.nix
@@ -17,8 +17,10 @@
       ];
     };
 
-    colors.mountain.enable = true;
+    # colors.mountain.enable = true;
+    colors.tomorrow.enable = true;
     gpg.enable = true;
+    zsh.theme = "simple";
 
     pass = {
       enable = true;
diff --git a/modules/foot.nix b/modules/foot.nix
index 18e1e80..b909ee2 100644
--- a/modules/foot.nix
+++ b/modules/foot.nix
@@ -19,7 +19,8 @@ in
         main = {
           # font="ComicShannsMono Nerd Font Mono:size=12";
           # font="BerkeleyMonoPatched Nerd Font Mono:size=12";
-          font ="GoMono Nerd Font Mono:size=12";
+          # font ="Hack Nerd Font Mono:size=10";
+          font ="TamzenForPowerline:size=11,Cozette:size=11";
           title="term";
           resize-by-cells="no";
           pad="0x0 center";
diff --git a/modules/global.nix b/modules/global.nix
index 0a80fdc..eec259e 100644
--- a/modules/global.nix
+++ b/modules/global.nix
@@ -68,6 +68,8 @@ in
       };
     };
 
+    fonts.fontconfig.enable = true;
+
     dconf = {
       enable = true;
       settings = {
@@ -110,14 +112,17 @@ in
       ];
 
       packages = with pkgs; [
-        nerd-fonts.comic-shanns-mono
         eza
+        fanwood
         ripgrep
         elan
         dmenu
         berkeley-mono
-        fanwood
-      ] ++ (lib.optional cfg.notNixOS nixgl.auto.nixGLDefault)
+        tamzen
+        roboto
+        cozette
+      ] ++ (builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts))
+        ++ (lib.optional cfg.notNixOS nixgl.auto.nixGLDefault)
         ++ (lib.optionals cfg.wayland 
         [
           wl-clipboard
diff --git a/modules/i3status.nix b/modules/i3status.nix
index 68168e5..b19d180 100644
--- a/modules/i3status.nix
+++ b/modules/i3status.nix
@@ -65,7 +65,7 @@ in
         "tztime local" = {
           position = 10;
           settings = {
-            format = "󰥔 %-I:%M %P";
+            format = "◴ %-I:%M %P";
             
           };
         };
diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix
index 179bb1c..03b8831 100644
--- a/modules/neovim/default.nix
+++ b/modules/neovim/default.nix
@@ -77,7 +77,7 @@ in
         oil-nvim
         nvim-lspconfig
         # tinted-vim
-        base16-vim
+        base16-nvim
         telescope-nvim
         telescope-fzf-native-nvim
         # fzf-lua
diff --git a/modules/neovim/nvim/lua/config/colorscheme.lua b/modules/neovim/nvim/lua/config/colorscheme.lua
index bfbdcf8..eb7f8bb 100644
--- a/modules/neovim/nvim/lua/config/colorscheme.lua
+++ b/modules/neovim/nvim/lua/config/colorscheme.lua
@@ -1,4 +1,3 @@
-vim.cmd[[hi link FzfLuaBorder FloatBorder]]
 vim.api.nvim_create_autocmd("ColorScheme", { callback = function(args)
   local colors = require('base16-colorscheme').colors
   vim.api.nvim_set_hl(0, 'FloatBorder', { fg = colors.base01 })
@@ -13,7 +12,7 @@ vim.api.nvim_create_autocmd("ColorScheme", { callback = function(args)
      hi TabLine guibg=bg
   ]]
 
-  vim.api.nvim_set_hl(0, 'FzfLuaBorder', { link = FloatBorder })
+  vim.api.nvim_set_hl(0, 'FzfLuaBorder', { fg = colors.base01 })
 
 
   -- i dislike syntax highlighting
diff --git a/modules/neovim/nvim/lua/config/oil.lua b/modules/neovim/nvim/lua/config/oil.lua
index 492d4eb..592421b 100644
--- a/modules/neovim/nvim/lua/config/oil.lua
+++ b/modules/neovim/nvim/lua/config/oil.lua
@@ -1,7 +1,7 @@
 require("oil").setup({
   default_file_explorer = true,
   columns = {
-    "icon"
+    -- "icon"
   },
   constrain_cursor = "editable",
   skip_confirm_for_simple_edits = true,
diff --git a/modules/neovim/nvim/lua/config/settings.lua b/modules/neovim/nvim/lua/config/settings.lua
index 7448dc4..2ff8821 100644
--- a/modules/neovim/nvim/lua/config/settings.lua
+++ b/modules/neovim/nvim/lua/config/settings.lua
@@ -48,38 +48,6 @@ vim.opt.foldenable=true
 -- vim.o.winborder = 'rounded' breaks telescope
 
 vim.cmd[[set wildchar=<C-n>]]
--- vim.api.nvim_set_hl(0, 'Comment', {})
-vim.api.nvim_set_hl(0, 'Constant', {})
--- vim.api.nvim_set_hl(0, 'String', {})
-vim.api.nvim_set_hl(0, 'Character', { link = "String" })
-vim.api.nvim_set_hl(0, 'Number', {})
-vim.api.nvim_set_hl(0, 'Boolean', {})
-vim.api.nvim_set_hl(0, 'Float', {})
-vim.api.nvim_set_hl(0, 'Identifier', {})
-vim.api.nvim_set_hl(0, 'Function', {})
-vim.api.nvim_set_hl(0, 'Statement', {})
-vim.api.nvim_set_hl(0, 'Conditional', {})
-vim.api.nvim_set_hl(0, 'Repeat', {})
-vim.api.nvim_set_hl(0, 'Label', {})
-vim.api.nvim_set_hl(0, 'Operator', {})
-vim.api.nvim_set_hl(0, 'Keyword', {})
-vim.api.nvim_set_hl(0, 'Exception', {})
-vim.api.nvim_set_hl(0, 'PreProc', {})
-vim.api.nvim_set_hl(0, 'Include', {})
-vim.api.nvim_set_hl(0, 'Define', {})
-vim.api.nvim_set_hl(0, 'Macro', {})
-vim.api.nvim_set_hl(0, 'PreCondit', {})
-vim.api.nvim_set_hl(0, 'Type', {})
-vim.api.nvim_set_hl(0, 'StorageClass', {})
-vim.api.nvim_set_hl(0, 'Structure', {})
-vim.api.nvim_set_hl(0, 'Typedef', {})
-vim.api.nvim_set_hl(0, 'Special', {})
-vim.api.nvim_set_hl(0, 'SpecialChar', { link = 'String' })
-vim.api.nvim_set_hl(0, 'Tag', {})
-vim.api.nvim_set_hl(0, 'Delimiter', {})
--- vim.api.nvim_set_hl(0, 'SpecialComment', {})
-vim.api.nvim_set_hl(0, 'Debug', {})
--- vim.api.nvim_set_hl(0, 'Underlined', {})
 
 vim.cmd[[cnoreabbrev ts lua vim.treesitter.start()]]
 
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index 3de80ac..cd918ca 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -49,7 +49,7 @@ in
         right = "i";
 
         fonts = {
-          names = [ "GoMono Nerd Font Propo" ];
+          names = [ "Roboto" ];
           # style = "Bold";
           size = 10.0;
         };
@@ -85,9 +85,19 @@ in
           };
           "DP-2" = {
             mode = "1920x1080@239.761Hz";
+            position = "0,440";
+          };
+          "HDMI-A-1" = {
+            transform = "90";
+            position = "1920,0";
           };
         };
 
+        workspaceAutoBackAndForth = true;
+        workspaceOutputAssign = [
+        { output = "HDMI-A-1"; workspace = "0"; }
+        ];
+
         colors = {
           background = scheme.base00;
           focused = {
@@ -95,21 +105,21 @@ in
             background = scheme.base00;
             text = scheme.base0E;
             indicator = scheme.base02;
-            childBorder = scheme.base01;
+            childBorder = scheme.base0B;
           };
           focusedInactive = {
             border = scheme.base00;
             background = scheme.base00;
             text = scheme.base0E;
             indicator = scheme.base02;
-            childBorder = scheme.base00;
+            childBorder = scheme.base01;
           };
           unfocused = {
             border = scheme.base00;
             background = scheme.base00;
             text = scheme.base03;
             indicator = scheme.base00;
-            childBorder = scheme.base00;
+            childBorder = scheme.base01;
           };
         };
 
@@ -118,7 +128,7 @@ in
           mode = "hide";
           hiddenState = "hide";
           fonts = {
-            names = [ "GoMono Nerd Font Propo" ];
+            names = [ "TamzenForPowerline" "cozette" ];
             size = "10.0";
           };
           extraConfig = ''
@@ -126,26 +136,26 @@ in
             separator_symbol " "
           '';
           colors = {
-            background = scheme.base00; # "#0d0d0d";
+            background = scheme.base02; # "#0d0d0d";
             statusline = scheme.base05;
             focusedWorkspace = {
-              border = scheme.base00; # "#0d0d0d";
-              background = scheme.base00; # "#0d0d0d";
+              border = scheme.base02; # "#0d0d0d";
+              background = scheme.base02; # "#0d0d0d";
               text = scheme.base05;
             };
             activeWorkspace = {
-              border = scheme.base00; # "#0d0d0d";
-              background = scheme.base00; # "#0d0d0d";
+              border = scheme.base02; # "#0d0d0d";
+              background = scheme.base02; # "#0d0d0d";
               text = scheme.base03;
             };
             inactiveWorkspace = {
-              border = scheme.base00; # "#0d0d0d";
-              background = scheme.base00; # "#0d0d0d";
+              border = scheme.base02; # "#0d0d0d";
+              background = scheme.base02; # "#0d0d0d";
               text = scheme.base03;
             };
             bindingMode = {
-              border = scheme.base00; # "#0d0d0d";
-              background = scheme.base00; # "#0d0d0d";
+              border = scheme.base02; # "#0d0d0d";
+              background = scheme.base02; # "#0d0d0d";
               text = scheme.base0E;
             };
           };
@@ -222,7 +232,7 @@ in
           "${modifier}+7" = "workspace number 7";
           "${modifier}+8" = "workspace number 8";
           "${modifier}+9" = "workspace number 9";
-          "${modifier}+0" = "workspace number 0";
+          "${modifier}+period" = "workspace number 0";
 
           "${modifier}+Shift+1" = "move container to workspace number 1";
           "${modifier}+Shift+2" = "move container to workspace number 2";
@@ -272,7 +282,7 @@ in
 
       extraConfig = ''
         title_align center
-        default_border pixel 2
+        default_border pixel 1
       '';
     };
   };