merge test

home/programs/alacritty/default.nix

@@ -4,7 +4,7 @@ let
   theme = builtins.fetchurl {
     url =
       "https://github.com/catppuccin/alacritty/raw/main/catppuccin-mocha.toml";
-    sha256 = "1rnc6gsqjdvkb6xbv1pnawrp6f0j5770dqml2di90j3lhv0fppgw";
+    sha256 = "1idjbm5jim9b36235hgwgp9ab81fmbij42y7h85l4l7cqcbyz74l";
   };
 in {
   home.packages = with pkgs; [ fira-code alacritty-theme ];

home/programs/default.nix

@@ -3,7 +3,6 @@
     ./alacritty
     ./anki
     ./calibre
-    #./cura
     ./discord
     ./dolphin
     ./dunst
@@ -14,11 +13,10 @@
     ./inkscape
     ./ktouch
     ./libreoffice
-    ./maestral
     ./neovim
-    ##./nixvim
     ./nextcloud
     ./obs
+    ./openscad
     ./picard
     ./planify
     ./prismlauncher
@@ -38,6 +36,5 @@
     ./xmonad
     ./zoom
     ./zsh
-    ./zulip
   ];
 }

home/programs/eww/src/eww.yuck

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 (defwindow bar-primary
   :monitor 0
   :geometry (geometry :x "0px"
@@ -16,82 +17,34 @@
       :onrightclick "notify-send Right"
       "Click Me!")
   (rightSideBar)))
+=======
+(defwidget workspaces-and-windows []
+  (let content (split " " (file "/tmp/xmonad-eww-log"))
+    (let ws-list (take 9 content)
+      (let win-list (drop 9 content)
+        (box :orientation "vertical" :class "bar"
+>>>>>>> test
 
-;; The Wrapper of the rightside Information
-(defwidget rightSideBar []
-  (box
-    :space-evenly "false"
-    :halign "end"
-    (audio)
-    (nw)
-    (date)
-  ))
+          ;; Workspaces
+          (box :orientation "horizontal"
+            (for ws in ws-list
+              (let class (if (starts-with ws "[[")
+                "ws-current"
+                (if (starts-with ws "(")
+                    "ws-visible"
+                    "ws-hidden")))
+                (let name (string-trim ws "[]()")
+                  (button :onclick (format "wmctrl -s %s" name)
+                          :class class
+                          (label :text name))))))
 
-;; The Internet Information box.
-(defwidget audio []
-(box :class "container"
-    :space-evenly "false"
-    :halign "end"
-    (label :class "iconBat" :text "${volicon} ")
-  (label :class "text" :text "${vol} % ")
-  (label :class "text" :text "${micicon} ")))
-
-;; The Internet Information box.
-(defwidget nw []
-(box :class "container"
-    :space-evenly "false"
-    :halign "end"
-    (label :class "iconNWDown" :text " ")
-  (label :class "text" :text " ${nwdown} ")
-    (label :class "iconNWUp" :text " ")
-  (label :class "text" :text "${nwup} ")))
-
-;; The date Information box.
-(defwidget date []
-(box :class "container"
-    :space-evenly "false"
-    :halign "end"
-    (label :class "iconClock" :text " ")
-  (label :class "text" :text "${date-time} ")))
-
-;; Variables
-
-(defpoll volicon
-  :interval "1s"
-  :initial "-"  ; optional, defaults to poll at startup
-  `if [[ $(cut -d ' ' -f 2 <<< $(pulseaudio-ctl full-status)) == "yes" ]]; then echo "󰝟"; else echo ""; fi`)
-
-(defpoll vol
-  :interval "1s"
-  :initial "-"  ; optional, defaults to poll at startup
-  `Volume=$(cut -d ' ' -f 1 <<<$(pulseaudio-ctl full-status)); echo "$(( Volume/2 ))"`)
-
-(defpoll micicon
-  :interval "1s"
-  :initial "-"  ; optional, defaults to poll at startup
-  `if [[ $(cut -d ' ' -f 3 <<< $(pulseaudio-ctl full-status)) == "yes" ]]; then echo ""; else echo ""; fi`)
-
-(defpoll nwup ;; TODO
-  :interval "1s"
-  :initial "-"  ; optional, defaults to poll at startup
-  `echo "up"`)
-
-(defpoll nwdown ; TODO
-  :interval "1s"
-  :initial "-"  ; optional, defaults to poll at startup
-  `echo "down"`)
-
-(defpoll date-time
-  :interval "1s"
-  :initial "initial-value"  ; optional, defaults to poll at startup
-  `date "+%a %d.%m.%y %H:%M:%S"`)
-
-;; IDK
-(defwidget greeter [?text name]
-(box :orientation "horizontal"
-    :halign "center"
-    :geometry (geometry :x "0px"
-      :y "0px"
-      :height "20px"
-      :anchor "top center")
-    text))
+          ;; Open windows
+          (box :orientation "horizontal" :class "window-list"
+            (for win in win-list
+              (let class (if (starts-with win "*") "win-focused" "win")
+                (label :class class :text (string-trim win "*")))))
+        )
+      )
+    )
+  )
+)

home/programs/eww/src/eww.yuck.orig

@@ -0,0 +1,50 @@
+<<<<<<< HEAD
+(defwindow bar-primary
+  :monitor 0
+  :geometry (geometry :x "0px"
+    :y "0px"
+    :width "100%"
+    :height "25px"
+    :anchor "top center")
+  :stacking "fg"
+  :reserve (struts :distance 25px" :side "top")
+  :windowtype "dock"
+  :wm-ignore false
+(box
+    :orientation "horizontal"
+    :halign "right"
+  (eventbox :onclick "notify-send Left"
+      :onrightclick "notify-send Right"
+      "Click Me!")
+  (rightSideBar)))
+=======
+(defwidget workspaces-and-windows []
+  (let content (split " " (file "/tmp/xmonad-eww-log"))
+    (let ws-list (take 9 content)
+      (let win-list (drop 9 content)
+        (box :orientation "vertical" :class "bar"
+>>>>>>> test
+
+          ;; Workspaces
+          (box :orientation "horizontal"
+            (for ws in ws-list
+              (let class (if (starts-with ws "[[")
+                "ws-current"
+                (if (starts-with ws "(")
+                    "ws-visible"
+                    "ws-hidden")))
+                (let name (string-trim ws "[]()")
+                  (button :onclick (format "wmctrl -s %s" name)
+                          :class class
+                          (label :text name))))))
+
+          ;; Open windows
+          (box :orientation "horizontal" :class "window-list"
+            (for win in win-list
+              (let class (if (starts-with win "*") "win-focused" "win")
+                (label :class class :text (string-trim win "*")))))
+        )
+      )
+    )
+  )
+)

home/programs/eww/src/scripts/xmonad_log.sh

@@ -0,0 +1,4 @@
+tail -F /tmp/xmonad-eww-log | while read -r line; do
+  clean_line=$(echo "$line" | sed -E 's/<[^>]+>//g')
+  eww update xmonad_log="$clean_line"
+done

home/programs/maestral/default.nix

@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [ maestral maestral-gui ];
-}

home/programs/neovim/default.nix

@@ -10,6 +10,10 @@ in {
     nerd-fonts.jetbrains-mono
     texliveFull
     clang-tools
+<<<<<<< HEAD
+=======
+    vimPlugins.catppuccin-nvim
+>>>>>>> test
   ];
 
   programs.neovim = {
@@ -91,7 +95,11 @@ in {
       neovim-remote
       # Nix
       nixd
+<<<<<<< HEAD
       nixfmt-classic
+=======
+      nixfmt-rfc-style
+>>>>>>> test
       # Rust
       rust-analyzer
       # Bash

home/programs/neovim/default.nix.orig

@@ -0,0 +1,126 @@
+{ pkgs, config, ... }:
+
+let
+  mkLuaConfig = file: args:
+    builtins.readFile "${pkgs.substituteAll (args // { src = file; })}";
+in {
+  home.sessionVariables = { EDITOR = "nvim"; };
+
+  home.packages = with pkgs; [
+    nerd-fonts.jetbrains-mono
+    texliveFull
+    clang-tools
+<<<<<<< HEAD
+=======
+    vimPlugins.catppuccin-nvim
+>>>>>>> test
+  ];
+
+  programs.neovim = {
+    enable = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+    withNodeJs = true;
+    withPython3 = true;
+
+    plugins = (with pkgs.vimPlugins; [
+      bufferline-nvim
+      catppuccin-nvim
+      cmp-buffer
+      cmp-conjure
+      cmp-nvim-lua
+      cmp-nvim-lsp
+      cmp-path
+      cmp_luasnip
+      conform-nvim
+      conjure
+      dropbar-nvim
+      friendly-snippets
+      lazy-nvim
+      lean-nvim
+      leap-nvim
+      lspkind-nvim
+      lualine-lsp-progress
+      lualine-nvim
+      luasnip
+      markdown-preview-nvim
+      neoconf-nvim
+      neodev-nvim
+      neoscroll-nvim
+      nvim-autopairs
+      nvim-cmp
+      nvim-lspconfig
+      nvim-surround
+      nvim-tree-lua
+      nvim-treesitter-textobjects
+      nvim-ts-context-commentstring
+      nvim-web-devicons
+      oil-nvim
+      plenary-nvim
+      rainbow-delimiters-nvim
+      telescope-fzf-native-nvim
+      telescope-nvim
+      vimtex
+      which-key-nvim
+    ]) ++ [
+      (pkgs.vimPlugins.nvim-treesitter.withPlugins
+        (plugins: pkgs.tree-sitter.allGrammars))
+    ];
+
+    extraPackages = with pkgs; [
+      ripgrep
+      fd
+      codespell
+      prettierd
+      # Lua
+      lua-language-server
+      stylua
+      # Haskell
+      haskell-language-server
+      ghc
+      stack
+      cabal-install
+      haskellPackages.fourmolu
+      # Lean
+      lean
+      # Python
+      ruff
+      pyright
+      isort
+      python311Packages.autopep8
+      # LaTeX
+      texlab
+      xdotool
+      pplatex
+      neovim-remote
+      # Nix
+      nixd
+<<<<<<< HEAD
+      nixfmt-classic
+=======
+      nixfmt-rfc-style
+>>>>>>> test
+      # Rust
+      rust-analyzer
+      # Bash
+      nodePackages.bash-language-server
+      shellcheck
+      shellharden
+      # sh
+      shfmt
+      # Scheme
+      chez
+    ];
+
+    extraLuaConfig = mkLuaConfig ./init.lua {
+      path = "${pkgs.vimUtils.packDir
+        config.programs.neovim.finalPackage.passthru.packpathDirs}";
+    };
+  };
+
+  xdg.configFile."nvim/lua" = {
+    recursive = true;
+    source = ./lua;
+  };
+}
+

home/programs/neovim/lua/plugins/catppuccin-nvim.lua

@@ -5,6 +5,7 @@ return {
     name = "catppuccin",
     priority = 1000,
     config = function()
+      require("catppuccin").setup()
       vim.cmd.colorscheme("catppuccin-mocha")
     end,
     opts = {

home/programs/neovim/lua/plugins/conform-nvim.lua

@@ -29,7 +29,11 @@ return {
           markdown = { "prettierd" },
           json = { "prettierd" },
           yaml = { "prettierd" },
+<<<<<<< HEAD
           nix = { "nixfmt-classic" },
+=======
+          nix = { "nixfmt-rfc-style" },
+>>>>>>> test
           tex = { "latexindent" },
           c = { "clang_format" },
           cpp = { "clang_format" },

home/programs/neovim/lua/plugins/conform-nvim.lua.orig

@@ -0,0 +1,66 @@
+return {
+  {
+    "stevearc/conform.nvim",
+    event = { "BufWritePre" },
+    cmd = "ConformInfo",
+    keys = {
+      {
+        "<leader>cF",
+        function()
+          require("conform").format({ formatters = { "injected" } })
+        end,
+        mode = { "n", "v" },
+        desc = "Format Injected Langs",
+      },
+    },
+    config = function()
+      require("conform").setup({
+        format_on_save = {
+          -- These options will be passed to conform.format()
+          timeout_ms = 500,
+          lsp_fallback = true,
+        },
+        formatters_by_ft = {
+          lua = { "stylua" },
+          python = { "isort", "autopep8" },
+          haskell = { "fourmolu" },
+          bash = { "shellcheck", "shellharden" },
+          sh = { "shfmt" },
+          markdown = { "prettierd" },
+          json = { "prettierd" },
+          yaml = { "prettierd" },
+<<<<<<< HEAD
+          nix = { "nixfmt-classic" },
+=======
+          nix = { "nixfmt-rfc-style" },
+>>>>>>> test
+          tex = { "latexindent" },
+          c = { "clang_format" },
+          cpp = { "clang_format" },
+          ["*"] = { "codespell" },
+          ["_"] = { "trim_whitespace" },
+        },
+        formatters = {
+          stylua = {
+            inherit = true,
+            prepend_args = { "--indent-type", "Spaces", "--indent-width", "2" },
+          },
+          codespell = {
+            inherit = true,
+            prepend_args = { "-L", "launch" },
+          },
+          latexindent = {
+            inherit = true,
+            prepend_args = { "-y=\"defaultIndent:'  '\"" },
+          },
+          clang_format = {
+            prepend_args = {
+              "--style=file:./.clang-format",
+              "--fallback-style=LLVM",
+            },
+          },
+        },
+      })
+    end,
+  },
+}

home/programs/openscad/default.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [ gnumake openscad ];
+}

home/programs/signal/default.nix

@@ -1,5 +1,5 @@
 { pkgs, ... }:
 
 {
-  home.packages = with pkgs; [ signal-desktop ];
+  home.packages = with pkgs; [ signal-desktop-bin ];
 }

home/programs/vscode/default.nix

@@ -3,7 +3,7 @@
 {
   programs.vscode = {
     enable = true;
-    extensions = with pkgs.vscode-extensions; [
+    profiles.default.extensions = with pkgs.vscode-extensions; [
       dracula-theme.theme-dracula
       vscodevim.vim
       yzhang.markdown-all-in-one

home/programs/xmonad/default.nix

@@ -19,5 +19,7 @@
     xorg.xmessage
     ghc
     cabal-install
+    wmctrl
+    trayer
   ];
 }

home/programs/xmonad/src/xmonad.hs

@@ -1,102 +1,101 @@
-import XMonad
-import XMonad.Util.SpawnOnce (spawnOnce)
-import XMonad.Hooks.EwmhDesktops
-import XMonad.Util.EZConfig
-import XMonad.Hooks.DynamicLog
-import XMonad.Hooks.StatusBar
-import XMonad.Hooks.StatusBar.PP
-import XMonad.Layout.ThreeColumns
-import XMonad.Layout.Magnifier
-import XMonad.Util.ClickableWorkspaces
-import XMonad.Util.Loggers
 import Data.ByteString (maximum)
 import Distribution.Compat.Prelude (print)
---import Control.Monad.RWS (All(All))
+import System.IO
+import XMonad
+import XMonad.Hooks.DynamicLog
+import XMonad.Hooks.EwmhDesktops
+import XMonad.Hooks.ManageDocks
+import XMonad.Hooks.StatusBar
+import XMonad.Hooks.StatusBar.PP
+import XMonad.Layout.Magnifier
+import XMonad.Layout.ThreeColumns
+import XMonad.Util.ClickableWorkspaces
+import XMonad.Util.EZConfig
+import XMonad.Util.Loggers
+import XMonad.Util.Run (spawnPipe)
+import XMonad.Util.SpawnOnce (spawnOnce)
+
+-- import Control.Monad.RWS (All(All))
 import XMonad.Hooks.ManageHelpers
 
+main = do
+    xmonad . ewmhFullscreen . ewmh $ myConfig
 
-main = xmonad . ewmhFullscreen . ewmh . withEasySB (statusBarProp "xmobar" (pure myXmobarPP)) defToggleStrutsKey $ myconfig
+myConfig =
+    def
+        { modMask = mod4Mask
+        , terminal = "alacritty"
+        , layoutHook = avoidStruts myLayout
+        , normalBorderColor = "#f5c2e7"
+        , focusedBorderColor = "#cdd6f4"
+        , manageHook = manageDocks <+> myManageHooks
+        , startupHook = myStartupHook
+        , logHook = dynamicLogWithPP myXmobarPP
+        }
+        `additionalKeysP` myKeys
 
-myconfig = def
-  {
-    modMask               = mod4Mask
-    , layoutHook          = myLayout
-    , terminal            = "alacritty"
-    , normalBorderColor   = "#f5c2e7"
-    , focusedBorderColor  = "#cdd6f4"
-    , manageHook          = myManageHooks
-    , startupHook         = myStartupHook
-  }
-  `additionalKeysP`
-  [
-    -- Messages
-    ("M-m w", spawn "xmessage 'Test Message :)'")  -- type mod+x then w to pop up 'woohoo!')
-    -- System
+myKeys =
+    [ -- Messages
+      ("M-m w", spawn "xmessage 'Test Message :)'") -- type mod+x then w to pop up 'woohoo!')
+      -- System
     , ("M-p", spawn "rofi -show \"drun\"")
-    -- Screenshots
-    , ("<Print>", spawn "maim --format=png \"/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S).png\"") -- Whole Screen to File
+    , -- Screenshots
+      ("<Print>", spawn "maim --format=png \"/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S).png\"") -- Whole Screen to File
     , ("M-<Print>", spawn "maim --format=png --window  $(xdotool getactivewindow) \"/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S).png\"") -- Focused Window to File
     , ("S-<Print>", spawn "maim --format=png --select \"/home/$USER/Pictures/screenshot-$(date -u +%Y-%m-%d-%H:%M:%S).png\"") -- Selection to File
     , ("C-<Print>", spawn "maim --format=png | xclip -selection clipboard -t image/png") -- Whole Screen to Clipboard
     , ("M-C-<Print>", spawn "maim --format=png --window $(xdotool getactivewindow) | xclip -section clipboard -t image/png") -- Focused Window to Clipboard
     , ("C-S-<Print>", spawn "maim --format=png --select | xclip -selection clipboard -t image/png") -- Selection to Clipboard
-    --Program
+    -- Program
     , ("M-c", spawn "firefox")
     , ("M-y", spawn "signal-desktop")
     , ("M-x", spawn "telegram-desktop")
     , ("M-c", spawn "firefox")
     , ("M-v", spawn "thunderbird")
-    -- Brightness
-    , ("<XF86MonBrightnessUp>", spawn "xbacklight -inc 10")
+    , -- Brightness
+      ("<XF86MonBrightnessUp>", spawn "xbacklight -inc 10")
     , ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 10")
-    -- Audio
-    , ("<XF86AudioMute>", spawn "pulseaudio-ctl mute")
+    , -- Audio
+      ("<XF86AudioMute>", spawn "pulseaudio-ctl mute")
     , ("<XF86AudioRaiseVolume>", spawn "pulseaudio-ctl up 5")
     , ("<XF86AudioLowerVolume>", spawn "pulseaudio-ctl down 5")
     , ("<XF86AudioMicMute>", spawn "pulseaudio-ctl mute-input")
-  ]
-  --`removeKeysP` [ "M-S-q" ]
+    ]
+
+-- `removeKeysP` [ "M-S-q" ]
 
 myXmobarPP :: PP
-myXmobarPP = def
-    {
-      ppSep               = pink " • "
-      , ppWsSep           = ""
-      , ppCurrent         = wrap " " "" . xmobarBorder "Top" "#f38ba8" 2
-      , ppVisible         = wrap " " "" . xmobarBorder "Top" "#a6e3a1" 2
-      , ppHidden          = green . wrap " " ""
-      , ppHiddenNoWindows = gray . wrap " " ""
-      , ppUrgent          = red . wrap (yellow "!") (yellow "!")
-      , ppTitleSanitize   = xmobarStrip
-      , ppOrder           = \[ws, l, _, wins] -> [ws, l, wins]
-      , ppExtras          = [logTitles formatFocused formatUnfocused]
-    }
+myXmobarPP =
+    def
+        { ppOutput = \str -> do
+            writeFile "/tmp/xmonad-eww-log" str
+        , ppCurrent = wrap "[[" "]]"
+        , ppVisible = wrap "(" ")"
+        , ppHidden = wrap " " " "
+        , ppHiddenNoWindows = id
+        , ppUrgent = wrap "!" "!"
+        , ppSep = " "
+        , ppOrder = \(ws : _ : _ : wins : _) -> [ws, wins]
+        , ppExtras = [logTitles formatFocused formatUnfocused]
+        }
   where
-    formatFocused   = wrap "[" "]" . pink . ppWindow
-    formatUnfocused = wrap "[" "]" . gray . ppWindow
+    formatFocused = wrap "*" "*" . ppWindow
+    formatUnfocused = id . ppWindow
 
     ppWindow :: String -> String
-    ppWindow = xmobarRaw . (\w -> if null w then "???" else w) . shorten 15 -- set maximum length of windowtitle to 15
+    ppWindow w = if null w then "???" else take 30 w
 
-    pink, gray, red, yellow, green :: String -> String
-    pink   = xmobarColor "#f5c2e7" ""
-    green = xmobarColor "#a6e3a1" ""
-    gray = xmobarColor "#cdd6f4" ""
-    red      = xmobarColor "#f38ba8" ""
-    yellow   = xmobarColor "#f9e2af" ""
-
-
-myLayout = Tall 1 (3/100) (1/2) ||| Mirror (Tall 1 (3/100) (1/2)) ||| Full ||| ThreeColMid 1 (3/100) (1/2) -- wenn wieder zoom von fokusierten Seitenfenstern gewünscht, dann Fireox fixn und: magnifiercz' 1.3 (ThreeColMid 1 (3/100) (1/2))
+myLayout = Tall 1 (3 / 100) (1 / 2) ||| Mirror (Tall 1 (3 / 100) (1 / 2)) ||| Full ||| ThreeColMid 1 (3 / 100) (1 / 2) -- wenn wieder zoom von fokusierten Seitenfenstern gewünscht, dann Fireox fixn und: magnifiercz' 1.3 (ThreeColMid 1 (3/100) (1/2))
 
 myManageHooks :: ManageHook
-myManageHooks = composeAll
-  [
-    isDialog --> doFloat
-    , className =? "Xmessage" --> doCenterFloat
-  ]
+myManageHooks =
+    composeAll
+        [ isDialog --> doFloat
+        , className =? "Xmessage" --> doCenterFloat
+        ]
 
 myStartupHook :: X ()
 myStartupHook = do
-  mapM_ spawnOnce ["xmobar -x " ++ show sid | sid <- [0..9]]
-  spawnOnce "dropbox"
-  spawnOnce "nextcloud --background"
+    spawnOnce "nextcloud --background"
+    spawnOnce "trayer --edge top --align left --widthtype request --height 25 --transparent true --alpha 0 --expand false --SetDockType true --SetPartialStrut true --monitor primary &"
+    spawnOnce "eww open bar"

home/programs/zulip/default.nix

@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [ zulip ];
-}