toUnstable

home/default-laptop.nix

@@ -1,13 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./programs/default-laptop.nix
-    ./services/default-laptop.nix
-    ./default.nix
-  ];
-
-  home.file."minlog".source =
-    config.lib.file.mkOutOfStoreSymlink "${pkgs.minlog}/share/minlog";
+  imports = [ ./programs/default-laptop.nix ./default.nix ];
 
 }

home/programs/default.nix

@@ -2,7 +2,7 @@
   imports = [
     ./alacritty
     ./anki
-    ./cura
+    #./cura
     ./discord
     ./dolphin
     ./dunst
@@ -14,6 +14,7 @@
     ./libreoffice
     ./maestral
     ./neovim
+    ##./nixvim
     ./nextcloud
     ./obs
     ./picard

home/programs/dolphin/default.nix

@@ -4,7 +4,7 @@
   home.packages = with pkgs; [
     libsForQt5.dolphin
     libsForQt5.dolphin-plugins
-    gnome.nautilus
+    nautilus
     udisks
   ];
 }

home/programs/git/default.nix

@@ -7,7 +7,7 @@
     userEmail = "elias.schroeter@e.email";
     signing = {
       key = "0x99D2EF975FE523CC";
-      signByDefault = true;
+      signByDefault = false;
     };
   };
 }

home/programs/neovim/default.nix

@@ -1,17 +1,8 @@
 { pkgs, config, ... }:
 
 let
-  obsidian-nvim = pkgs.vimUtils.buildVimPlugin {
-    pname = "obsidian.nvim";
-    version = "v3.5.1";
-    src = pkgs.fetchFromGitHub {
-      owner = "epwalsh";
-      repo = "obsidian.nvim";
-      rev = "4eb44381811ab6af67b9f9fe3117616afbe1e118";
-      sha256 = "sha256-/zj12pwppb1RGi3EovXla6Ahzkoxh3qhxQFOfnfPwac=";
-    };
-    meta.homepage = "https://github.com/epwalsh/obsidian.nvim";
-  };
+  mkLuaConfig = file: args:
+    builtins.readFile "${pkgs.substituteAll (args // { src = file; })}";
 in {
   home.sessionVariables = { EDITOR = "nvim"; };
 
@@ -19,11 +10,12 @@ in {
 
   programs.neovim = {
     enable = true;
-    package = pkgs.neovim-nightly;
+    vimAlias = true;
+    vimdiffAlias = true;
     withNodeJs = true;
     withPython3 = true;
 
-    plugins = with pkgs.vimPlugins; [
+    plugins = (with pkgs.vimPlugins; [
       bufferline-nvim
       catppuccin-nvim
       cmp-buffer
@@ -53,7 +45,6 @@ in {
       nvim-lspconfig
       nvim-surround
       nvim-tree-lua
-      nvim-treesitter.withAllGrammars
       nvim-treesitter-textobjects
       nvim-ts-context-commentstring
       nvim-web-devicons
@@ -65,6 +56,9 @@ in {
       telescope-nvim
       vimtex
       which-key-nvim
+    ]) ++ [
+      (pkgs.vimPlugins.nvim-treesitter.withPlugins
+        (plugins: pkgs.tree-sitter.allGrammars))
     ];
 
     extraPackages = with pkgs; [
@@ -85,7 +79,7 @@ in {
       lean
       # Python
       ruff-lsp
-      nodePackages.pyright
+      pyright
       isort
       python311Packages.autopep8
       # LaTeX
@@ -108,34 +102,10 @@ in {
       chez
     ];
 
-    extraLuaConfig = ''
-      vim.g.mapleader = " "
-      vim.g.maplocalleader = ","
-      require("lazy").setup({
-        spec = {
-          -- Import plugins from lua/plugins
-          { import = "plugins" },
-        },
-        performance = {
-          reset_packpath = false,
-          rtp = {
-              reset = false,
-            }
-          },
-        dev = {
-          path = "${
-            pkgs.vimUtils.packDir
-            config.programs.neovim.finalPackage.passthru.packpathDirs
-          }/pack/myNeovimPackages/start",
-          patterns = {"arkav", "Bekaboo", "catppuccin", "epwalsh", "folke", "ggandor", "HiPhish", "hrsh7th", "iamcco", "Joosep", "Julian", "karb94", "kylechui", "L3MON4D3", "lervag", "mrcjkb", "neovim", "numToStr", "nvim-lua", "nvim-lualine", "nvim-telescope", "nvim-tree", "nvim-treesitter", "Olical", "onsails", "PaterJason", "rafamadiz", "saadparwaiz1", "skanehira", "stevearc", "tpope", "windwp"},
-        },
-        install = {
-          -- Safeguard in case we forget to install a plugin with Nix
-          missing = false,
-        },
-      })
-      require("config/options")
-    '';
+    extraLuaConfig = mkLuaConfig ./init.lua {
+      path = "${pkgs.vimUtils.packDir
+        config.programs.neovim.finalPackage.passthru.packpathDirs}";
+    };
   };
 
   xdg.configFile."nvim/lua" = {

home/programs/neovim/init.lua

@@ -0,0 +1,61 @@
+vim.g.mapleader = " "
+require("lazy").setup({
+  spec = {
+    -- Import plugins from lua/plugins
+    { import = "plugins" },
+  },
+  performance = {
+    reset_packpath = false,
+    rtp = {
+      reset = false,
+    },
+  },
+  dev = {
+    path = "@path@/pack/myNeovimPackages/start",
+    patterns = {
+      "folke",
+      "catppuccin",
+      "Julian",
+      "hrsh7th",
+      "neovim",
+      "rafamadriz",
+      "saadparwaiz1",
+      "L3MON4D3",
+      "onsails",
+      "nvim-lua",
+      "Olical",
+      "PaterJason",
+      "iamcco",
+      "nvim-treesitter",
+      "HiPhish",
+      "lervag",
+      "windwp",
+      "kylechui",
+      "numToStr",
+      "JoosepAlviste",
+      "stevearc",
+      "nvim-tree",
+      "tpope",
+      "karb94",
+      "akinsho",
+      "nvim-lualine",
+      "arkav",
+      "nvimdev",
+      "ggandor",
+      "Bekaboo",
+      "nvim-telescope",
+      "aserowy",
+      "3rd",
+      "epwalsh",
+      "preservim",
+      "elkowar",
+      "dynamotn",
+      "LhKipp",
+    },
+  },
+  install = {
+    -- Safeguard in case we forget to install a plugin with Nix
+    missing = false,
+  },
+})
+require("config/options")

home/programs/nixvim/default.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }: {
+  programs.nixvim = {
+    enable = true;
+    colorscheme = "catppuccin";
+    colorschemes.catppuccin = {
+      enable = true;
+      settings = { flavour = "mocha"; };
+    };
+  };
+}
+

home/programs/thunderbird/default.nix

@@ -43,7 +43,7 @@
         address = "elias.schroeter@e.email";
         gpg = {
           key = "0x99D2EF975FE523CC";
-          signByDefault = true;
+          signByDefault = false;
         };
         aliases = [ "elias.schroeter@murena.io" "xacufe67.cadome83@murena.io" ];
         imap = {

home/programs/xmonad/src/xmobar/xmobar-custom.cabal

@@ -23,10 +23,10 @@ name:               xmobar-custom
 version:            0.1.0.0
 
 -- The package author(s).
-author:             4Lost
+author:             einfischy
 
 -- An email address to which users can send suggestions, bug reports, and patches.
-maintainer:         elias.schroeter@e.email
+maintainer:         accounts.codeberg@kstn.in
 
 -- A copyright notice.
 -- copyright:
@@ -43,9 +43,8 @@ executable xmobar
     main-is:          xmobar.hs
 
     -- Other library packages from which modules are imported.
-    build-depends:    base ^>=4.17.2.1,
-                      xmobar ^>=0.47.1,
-                      process
+    build-depends:    base >= 4.11.0 && < 4.20,
+                      xmobar ^>=0.48
 
     -- Directories containing source files.
     hs-source-dirs:   .

home/programs/xmonad/src/xmobar/xmobar.hs

@@ -1,5 +1,5 @@
 import Xmobar
-import Plugins.Audio
+--import Plugins.Audio
 --import Xmobar.Run.Exec
 --import Xmobar (Command(ComX))
 --import GHC.Real (Integral(rem))

home/programs/xmonad/src/xmonad.hs

@@ -11,7 +11,7 @@ import XMonad.Util.ClickableWorkspaces
 import XMonad.Util.Loggers
 import Data.ByteString (maximum)
 import Distribution.Compat.Prelude (print)
-import Control.Monad.RWS (All(All))
+--import Control.Monad.RWS (All(All))
 import XMonad.Hooks.ManageHelpers
 
 

home/programs/zsh/default.nix

@@ -18,7 +18,7 @@
         "xrandr --output eDP-1 --auto --output HDMI-1 --mode 1920x1080 --left-of eDP-1";
       conWG = "ssh elias@logout.nonagon.dev -p 6969";
     };
-    enableAutosuggestions = true;
+    autosuggestion.enable = true;
     enableCompletion = true;
     enableVteIntegration = true;
     history = {

home/services/gpg-agent/default.nix

@@ -10,19 +10,20 @@ let
     '';
   };
 in {
-  home.packages = with pkgs; [ pinentry-rofi ];
+  home.packages = with pkgs; [ pinentry-rofi pinentry-gnome3 ];
 
   programs.gpg.enable = true;
 
   services.gpg-agent = {
     enable = true;
+    pinentryPackage = pkgs.pinentry-gnome3;
     enableZshIntegration = true;
-    pinentryFlavor = null;
     defaultCacheTtl = 7200; # 2h
     maxCacheTtl = 28800; # 8h
     extraConfig = ''
-      pinentry-program ${pinentryRofi}/bin/pinentry-rofi-with-env
+      ttyname $GPG_TTY
     '';
+
   };
 }
 

home/services/pipewire.nix

@@ -0,0 +1,13 @@
+{ config, lib, pkgs, ... }:
+
+{
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+}
+