Merge pull request 'master > work' (#36) from master into work

Reviewed-on: #36

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773264488,
-        "narHash": "sha256-rK0507bDuWBrZo+0zts9bCs/+RRUEHuvFE5DHWPxX/Q=",
+        "lastModified": 1767910483,
+        "narHash": "sha256-MOU5YdVu4DVwuT5ztXgQpPuRRBjSjUGIdUzOQr9iQOY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5c0f63f8d55040a7eed69df7e3fcdd15dfb5a04c",
+        "rev": "82fb7dedaad83e5e279127a38ef410bcfac6d77c",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773068389,
-        "narHash": "sha256-vMrm7Pk2hjBRPnCSjhq1pH0bg350Z+pXhqZ9ICiqqCs=",
+        "lastModified": 1767799921,
+        "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44bae273f9f82d480273bab26f5c50de3724f52f",
+        "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
         "type": "github"
       },
       "original": {

flake.nix

@@ -19,7 +19,10 @@
     }:
     let
       system = "x86_64-linux";
-      pkgs = import nixpkgs { inherit system; };
+      pkgs = import nixpkgs {
+        inherit system;
+        config.allowUnfree = true;
+      };
     in
     {
       homeConfigurations = {

home.nix

@@ -17,8 +17,7 @@
     ./programs/tmux.nix
     ./programs/git.nix
     ./programs/libreoffice.nix
-    ./programs/nvim.nix
-    ./programs/ripgrep.nix
+    ./programs/vscode.nix
     ./wm/rofi.nix
     ./wm/cursor.nix
     ./wm/dconf.nix

programs/git.nix

@@ -5,7 +5,7 @@
     enable = true;
     settings.user = {
       name = "Armel van Ravels";
-      email = "armel@armel.nl";
+      email = "armel@webavance.nl";
     };
   };
 }

programs/nvim.nix

@@ -1,158 +0,0 @@
-{ pkgs, ... }:
-
-{
-  programs.neovim = {
-    enable = true;
-    extraLuaPackages = ps: [ ps.magick ];
-    extraPackages = [
-      pkgs.ueberzugpp
-      pkgs.imagemagick
-    ];
-
-    plugins = with pkgs.vimPlugins; [
-      neo-tree-nvim
-      catppuccin-nvim
-      tokyonight-nvim
-      nvim-lspconfig
-      nvim-cmp
-      cmp-nvim-lsp
-      cmp-buffer
-      cmp-path
-      plenary-nvim
-      telescope-nvim
-      (nvim-treesitter.withAllGrammars)
-      vim-nix
-      lualine-nvim
-      image-nvim
-    ];
-
-    extraLuaConfig = ''
-      vim.cmd("colorscheme catppuccin-mocha")
-      -- Basic settings
-      vim.o.number = true
-      vim.o.relativenumber = true
-
-      -- =========================
-      -- LSP (Neovim 0.11+ way)
-      -- =========================
-
-      -- Add cmp capabilities
-      local capabilities = require("cmp_nvim_lsp").default_capabilities()
-
-      vim.lsp.config("nil_ls", {
-        capabilities = capabilities,
-      })
-
-      -- PHP LSP
-      vim.lsp.config("intelephense", {
-        capabilities = capabilities,
-      })
-
-      vim.lsp.enable("intelephense")
-
-
-      vim.lsp.enable("nil_ls")
-
-      -- =========================
-      -- nvim-cmp
-      -- =========================
-
-      local cmp = require("cmp")
-
-      cmp.setup({
-        mapping = cmp.mapping.preset.insert({
-          ["<C-Space>"] = cmp.mapping.complete(),
-          ["<CR>"] = cmp.mapping.confirm({ select = true }),
-        }),
-        sources = {
-          { name = "nvim_lsp" },
-          { name = "buffer" },
-          { name = "path" },
-        }
-      })
-
-      -- =========================
-      -- Telescope
-      -- =========================
-
-      local builtin = require("telescope.builtin")
-      vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
-      vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
-
-      -- =========================
-      -- Lualine (status line with Git branch)
-      -- =========================
-      require('lualine').setup {
-        options = {
-          theme = 'catppuccin',  -- match your colorscheme
-          section_separators = {'', ''},
-          component_separators = {'', ''},
-        },
-        sections = {
-          lualine_a = {'mode'},
-          lualine_b = {'branch'},  -- shows Git branch here
-          lualine_c = {'filename'},
-          lualine_x = {'encoding', 'fileformat', 'filetype'},
-          lualine_y = {'progress'},
-          lualine_z = {'location'}
-        }
-      }
-
-      -- =========================
-      -- image-nvim
-      -- ========================= 
-      require("image").setup({
-        backend = "ueberzug", -- or "ueberzug" or "sixel"
-        processor = "magick_cli", -- or "magick_rock"
-        integrations = {
-        markdown = {
-          enabled = true,
-          clear_in_insert_mode = false,
-          download_remote_images = true,
-          only_render_image_at_cursor = false,
-          only_render_image_at_cursor_mode = "popup", -- or "inline"
-          floating_windows = false, -- if true, images will be rendered in floating markdown windows
-          filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
-        },
-        asciidoc = {
-          enabled = true,
-          clear_in_insert_mode = false,
-          download_remote_images = true,
-          only_render_image_at_cursor = false,
-          only_render_image_at_cursor_mode = "popup",
-          floating_windows = false,
-          filetypes = { "asciidoc", "adoc" },
-        },
-        neorg = {
-          enabled = true,
-          filetypes = { "norg" },
-        },
-        rst = {
-          enabled = true,
-        },
-        typst = {
-          enabled = true,
-          filetypes = { "typst" },
-        },
-        html = {
-          enabled = false,
-        },
-        css = {
-          enabled = false,
-        },
-      },
-      max_width = nil,
-      max_height = nil,
-      max_width_window_percentage = nil,
-      max_height_window_percentage = 50,
-      scale_factor = 1.0,
-      window_overlap_clear_enabled = false, -- toggles images when windows are overlapped
-      window_overlap_clear_ft_ignore = { "cmp_menu", "cmp_docs", "snacks_notif", "scrollview", "scrollview_sign" },
-      editor_only_render_when_focused = false, -- auto show/hide images when the editor gains/looses focus
-      tmux_show_only_in_active_window = false, -- auto show/hide images in the correct Tmux window (needs visual-activity off)
-      hijack_file_patterns = { "*.png", "*.jpg", "*.jpeg", "*.gif", "*.webp", "*.avif" }, -- render image files as images when opened
-    })
-
-    '';
-  };
-}

programs/ripgrep.nix

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

programs/vscode.nix

@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+
+{
+  programs.vscode = {
+    enable = true;
+
+    package = pkgs.vscode.fhs;
+    profiles.default.extensions = with pkgs.vscode-extensions; [
+      ms-dotnettools.csharp
+      ms-dotnettools.csdevkit
+      ms-dotnettools.vscode-dotnet-runtime
+      mkhl.direnv   # Direnv integration for VSCode
+    ];
+
+    profiles.default.userSettings = {
+      "direnv.restart.automatic" = true;
+      "terminal.integrated.defaultProfile.linux" = "zsh";
+      "terminal.integrated.profiles.linux" = {
+        zsh = {
+          path = pkgs.zsh;
+        };
+      };
+    };
+  };
+}

programs/zsh.nix

@@ -14,6 +14,14 @@
     initContent = ''
       # Use kitty's ssh helper if running inside kitty
       [ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
+
+      [[ $- != *i* ]] && return
+
+      # Run fastfetch
+      if command -v fastfetch >/dev/null 2>&1; then
+        fastfetch --logo none --config ~/.zsh/fastfetch.jsonc
+      fi
+
     '';
   };
 }

wm/hyprland.nix

@@ -32,8 +32,8 @@
       };
 
       decoration = {
-        inactive_opacity = 0.8;
-        active_opacity = 0.9;
+        inactive_opacity = 0.9;
+        active_opacity = 1.0;
         rounding = 5;
         rounding_power = 2.5;
         blur = {

wm/hyprpaper.nix

@@ -15,6 +15,7 @@ in
       ];
       wallpaper = [
         "DP-2,${wallpaper2}"
+        "HDMI-A-1,${wallpaper2}"
         ",${wallpaper}"
       ];
     };

wm/waybar.nix

@@ -24,6 +24,7 @@
         "pulseaudio"
         "cpu"
         "tray"
+        "battery"
         "clock"
       ];
 
@@ -49,6 +50,10 @@
         ignored-players = [ "firefox" "vlc" ];
       };
 
+      tray = {
+        spacing = 10;
+      };
+
       cpu = {
         format = "  {usage}%";
         tooltip = false;
@@ -62,6 +67,11 @@
         format = "{icon} {name}";
         on-click = "activate";
       };
+
+      battery = {
+        "format" = "{icon}  {capacity}%";
+        "format-icons" = ["" "" "" "" ""];
+      };
     };
   };
 }