changed structure

flake.nix

@@ -5,6 +5,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-master.url = "github:nixos/nixpkgs/master";
+
     home-manager = {
       url = "github:nix-community/home-manager/release-23.05";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -33,7 +34,7 @@
     system = "x86_64-linux";
     pkgs = nixpkgs.legacyPackages.${system};
   in {
-    formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
+    formatter.${system} = pkgs.alejandra;
 
     homeConfigurations = {
       kristian = home-manager.lib.homeManagerConfiguration {
@@ -49,7 +50,7 @@
 
           {
             nixpkgs.overlays = [
-              zig.overlays.default # Adds zig
+              zig.overlays.default # Add zig
               ( # https://github.com/nix-community/home-manager/issues/1538#issuecomment-706627100
                 final: prev: {
                   unstable = import nixpkgs-unstable {

home/bash.nix

@@ -1,8 +1,11 @@
-{enable}: {
+{...}: {
-  inherit enable;
+  config.programs.bash = {
-  shellAliases = {
+    enable = true;
-    ll = "ls -lh";
+
-    la = "ls -lah";
+    shellAliases = {
-    ".." = "cd ..";
+      ll = "ls -lh";
+      la = "ls -lah";
+      ".." = "cd ..";
+    };
   };
 }

home/default.nix

@@ -1,11 +1,9 @@
 {
   config,
-  pkgs,
   lib,
   options,
   specialArgs,
   modulesPath,
-  wallpaper,
 }: {
   nixpkgs.config.allowUnfreePredicate = _: true;
 
@@ -18,19 +16,23 @@
     NIXOS_OZONE_WL = 1;
   };
 
-  # TODO: Change for Laptop
+  # Keyboard Layout
+  home.keyboard.layout = "at";
+
+  # TODO Change for Laptop
   targets.genericLinux.enable = false; # Enable on non-nixos ditros
 
-  # Keyboard Layout
+  imports = [
-  home.keyboard.layout = "at"; # NOTE: Set by Hyprland config
+    ./bash.nix
-
+    ./direnv.nix
-  # Programs (additional programs)
+    ./firefox.nix
-  home.packages = import ./packages.nix {inherit pkgs;};
+    ./git.nix
-
+    ./gnome.nix
-  # Services
+    ./nvim
-  services = {
+    ./packages.nix
-    copyq.enable = true;
+    ./thunderbird.nix
-  };
+    ./vscode.nix
+  ];
 
   # Programs
   programs = {
@@ -38,29 +40,16 @@
     mpv.enable = true;
     obs-studio.enable = true;
     yt-dlp.enable = true;
+  };
 
-    bash = import ./bash.nix {enable = true;};
+  # Services
-    vscode = import ./vscode.nix {
+  services = {
-      enable = true;
+    copyq.enable = true;
-      inherit pkgs;
-    };
-    direnv = import ./direnv.nix {enable = true;};
-    git = import ./git.nix {enable = true;};
-    thunderbird = import ./thunderbird.nix {enable = true;};
-
-    neovim = import ./nvim {
-      enable = true;
-      inherit pkgs;
-    };
-
-    firefox = import ./firefox.nix {
-      enable = true;
-      nur = config.nur;
-    };
   };
 
   xdg.mimeApps = {
     enable = true;
+
     defaultApplications = {
       "image/png" = ["org.gnome.eog.desktop"];
       "image/jpeg" = ["org.gnome.eog.desktop"];
@@ -68,10 +57,4 @@
       "application/pdf" = ["org.gnome.Evince.desktop"];
     };
   };
-
-  # Gnome settings
-  dconf.settings = import ./gnome.nix {
-    inherit lib;
-    inherit wallpaper;
-  };
 }

home/direnv.nix

@@ -1,5 +1,8 @@
-{enable}: {
+{...}: {
-  inherit enable;
+  config.programs.direnv = {
-  nix-direnv.enable = enable;
+    enable = true;
-  enableBashIntegration = true;
+
+    nix-direnv.enable = true;
+    enableBashIntegration = true;
+  };
 }

home/firefox.nix

@@ -1,24 +1,23 @@
-{
+{config, ...}: {
-  nur,
+  config.programs.firefox = {
-  enable,
+    enable = true;
-}: {
+
-  inherit enable;
+    profiles.kristian = {
-  profiles.kristian = {
+      isDefault = true;
-    isDefault = true;
+      search.default = "DuckDuckGo";
-    search.default = "DuckDuckGo";
+      search.force = true;
-    search.force = true;
+
-    extensions = builtins.attrValues {
+      extensions = with config.nur.repos.rycee.firefox-addons; [
-      inherit
-        (nur.repos.rycee.firefox-addons)
         ublock-origin
         umatrix
         sponsorblock
         sidebery
-        ;
+      ];
-    };
+
-    settings = {
+      settings = {
-      "extensions.pocket.enabled" = false;
+        "extensions.pocket.enabled" = false;
-      "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+      };
     };
   };
 }

home/git.nix

@@ -1,6 +1,11 @@
-{enable}: {
+{...}: {
-  inherit enable;
+  config.programs.git = {
-  userName = "Kristian Krsnik";
+    enable = true;
-  userEmail = "git@krsnik.at";
+
-  extraConfig = {init.defaultBranch = "main";};
+    userName = "Kristian Krsnik";
+    userEmail = "git@krsnik.at";
+    extraConfig = {
+      init.defaultBranch = "main";
+    };
+  };
 }

home/gnome.nix

@@ -1,72 +1,95 @@
 {
-  lib,
+  pkgs,
   wallpaper,
+  ...
 }: {
-  # Use `dconf watch /` to track stateful changes you are doing, then set them here.
+  config = {
-  "org/gnome/desktop/interface" = {
+    home.packages = with pkgs.gnomeExtensions; [
-    color-scheme = "prefer-dark";
+      quick-settings-audio-panel
-    gtk-theme = "Adwaita-dark";
+      tray-icons-reloaded
-  };
+      espresso
-  "org/gnome/desktop/background" = let
+      pano
-    width = 3840;
-    height = 2160;
-  in {
-    picture-uri = "file://${wallpaper.override {
-      preset = "nord-snow-aurora";
-      inherit width;
-      inherit height;
-    }}/share/wallpapers/nixos-wallpaper.png";
-    picture-uri-dark = "file://${wallpaper.override {
-      preset = "nord-night-aurora";
-      inherit width;
-      inherit height;
-    }}/share/wallpapers/nixos-wallpaper.png";
-  };
-  "org/gnome/desktop/wm/keybindings" = {
-    switch-to-workspace-left = ["<Alt>1"];
-    switch-to-workspace-right = ["<Alt>2"];
-    move-to-workspace-left = ["<Shift><Alt>1"];
-    move-to-workspace-right = ["<Shift><Alt>2"];
-  };
-  "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
-    binding = "<Shift><Alt>a";
-    command = "kgx";
-    name = "Console";
-  };
-  "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
-    binding = "<Shift><Alt>f";
-    command = "nautilus";
-    name = "File Manager";
-  };
-  "org/gnome/settings-daemon/plugins/media-keys" = {
-    custom-keybindings = [
-      "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
-      "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
-    ];
-  };
-  "org/gnome/settings-daemon/plugins/power" = {
-    sleep-inactive-ac-type = "nothing"; # Automatic suspend/hibernation creates a suspend/hibernation loop
-    power-button-action = "suspend";
-  };
-  "org/gnome/mutter" = {
-    edge-tiling = true;
-    dynamic-workspaces = true;
-  };
-  "org/gnome/Console" = {
-    theme = "auto";
-  };
-  "org/gnome/simple-scan" = {
-    text-dpi = 300;
-  };
-  "org/gnome/shell" = {
-    disable-user-extensions = false;
-    enabled-extensions = [
-      "quick-settings-audio-panel@rayzeq.github.io"
-      "places-menu@gnome-shell-extensions.gcampax.github.com"
-      "launch-new-instance@gnome-shell-extensions.gcampax.github.com"
-      "trayIconsReloaded@selfmade.pl"
-      "espresso@coadmunkee.github.com"
-      "pano@elhan.io"
     ];
+
+    dconf.settings = {
+      # Use `dconf watch /` to track stateful changes you are doing, then set them here.
+      "org/gnome/shell" = {
+        disable-user-extensions = false;
+        enabled-extensions = [
+          "quick-settings-audio-panel@rayzeq.github.io"
+          "places-menu@gnome-shell-extensions.gcampax.github.com"
+          "launch-new-instance@gnome-shell-extensions.gcampax.github.com"
+          "trayIconsReloaded@selfmade.pl"
+          "espresso@coadmunkee.github.com"
+          "pano@elhan.io"
+        ];
+      };
+
+      "org/gnome/desktop/interface" = {
+        color-scheme = "prefer-dark";
+        gtk-theme = "Adwaita-dark";
+      };
+
+      "org/gnome/desktop/background" = let
+        width = 3840;
+        height = 2160;
+      in {
+        picture-uri = "file://${wallpaper.override {
+          preset = "nord-snow-aurora";
+          inherit width;
+          inherit height;
+        }}/share/wallpapers/nixos-wallpaper.png";
+
+        picture-uri-dark = "file://${wallpaper.override {
+          preset = "nord-night-aurora";
+          inherit width;
+          inherit height;
+        }}/share/wallpapers/nixos-wallpaper.png";
+      };
+
+      "org/gnome/desktop/wm/keybindings" = {
+        switch-to-workspace-left = ["<Alt>1"];
+        switch-to-workspace-right = ["<Alt>2"];
+        move-to-workspace-left = ["<Shift><Alt>1"];
+        move-to-workspace-right = ["<Shift><Alt>2"];
+      };
+
+      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+        binding = "<Shift><Alt>a";
+        command = "kgx";
+        name = "Console";
+      };
+
+      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
+        binding = "<Shift><Alt>f";
+        command = "nautilus";
+        name = "File Manager";
+      };
+
+      "org/gnome/settings-daemon/plugins/media-keys" = {
+        custom-keybindings = [
+          "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
+          "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
+        ];
+      };
+
+      "org/gnome/settings-daemon/plugins/power" = {
+        sleep-inactive-ac-type = "nothing"; # Automatic suspend/hibernation creates a suspend/hibernation loop
+        power-button-action = "suspend";
+      };
+
+      "org/gnome/mutter" = {
+        edge-tiling = true;
+        dynamic-workspaces = true;
+      };
+
+      "org/gnome/Console" = {
+        theme = "auto";
+      };
+
+      "org/gnome/simple-scan" = {
+        text-dpi = 300;
+      };
+    };
   };
 }

home/nvim/default.nix

@@ -1,16 +1,14 @@
-{
+{pkgs, ...}: {
-  pkgs,
+  config.programs.neovim = {
-  enable,
+    enable = true;
-}: {
-  inherit enable;
-  defaultEditor = true;
-  viAlias = true;
-  vimAlias = true;
-  vimdiffAlias = true;
 
-  plugins = builtins.attrValues ({
+    defaultEditor = true;
-      inherit
+    viAlias = true;
-        (pkgs.vimPlugins)
+    vimAlias = true;
+    vimdiffAlias = true;
+
+    plugins = with pkgs.vimPlugins;
+      [
         telescope-nvim # fuzzy finder
         tokyonight-nvim # theme
         undotree # undotree
@@ -18,17 +16,13 @@
         nvim-treesitter # syntax highlighting
 
         # Autocomplete and LSP
-        
         nvim-lspconfig
         nvim-cmp
         cmp-nvim-lsp
         luasnip
-        ;
+      ]
-    }
+      ++ (with pkgs.vimPlugins.nvim-treesitter-parsers; [
-    // {
+        # Parsers for syntax highlighting
-      # Parsers for syntax highlighting
-      inherit
-        (pkgs.vimPlugins.nvim-treesitter-parsers)
         nix
         zig
         python
@@ -43,17 +37,18 @@
         c
         glsl
         bash
-        ;
+      ]);
-    });
+
-  extraPackages = [pkgs.nodePackages.pyright];
+    extraPackages = [pkgs.nodePackages.pyright];
-  extraLuaConfig =
+    extraLuaConfig =
-    builtins.readFile ./keybinds.lua
+      builtins.readFile ./keybinds.lua
-    + builtins.readFile ./colors.lua
+      + builtins.readFile ./colors.lua
-    + builtins.readFile ./undotree.lua
+      + builtins.readFile ./undotree.lua
-    + builtins.readFile ./fugitive.lua
+      + builtins.readFile ./fugitive.lua
-    + builtins.readFile ./treesitter.lua
+      + builtins.readFile ./treesitter.lua
-    + builtins.readFile ./telescope.lua
+      + builtins.readFile ./telescope.lua
-    + builtins.readFile ./cmp.lua
+      + builtins.readFile ./cmp.lua
-    + builtins.readFile ./lspconfig.lua;
+      + builtins.readFile ./lspconfig.lua;
-  extraConfig = "set number relativenumber";
+    extraConfig = "set number relativenumber";
+  };
 }

home/packages.nix

@@ -1,39 +1,32 @@
-{pkgs}:
+{pkgs, ...}: {
-with pkgs; [
+  config.home.packages = with pkgs; [
-  # Basic utils
+    # Basic utils
-  unzip
+    unzip
-  magic-wormhole
+    magic-wormhole
 
-  # Important graphical applications
+    # Important graphical applications
-  keepassxc
+    keepassxc
-  logseq
+    logseq
-  xournalpp
+    xournalpp
-  onlyoffice-bin
+    onlyoffice-bin
 
-  # Communication
+    # Communication
-  webcord
+    webcord
-  telegram-desktop
+    telegram-desktop
-  signal-desktop
+    signal-desktop
-  element-desktop
+    element-desktop
 
-  # image editor
+    # Creative software
-  gimp
+    gimp
-  davinci-resolve
+    davinci-resolve
 
-  # games
+    # Games
-  osu-lazer
+    osu-lazer
 
-  # Misc
+    # Misc
-  nerdfonts # Font with glyphs for status bar
+    nerdfonts # Font with glyphs for status bar
-  comma # Run any binary from the repos with a comma `, cowsay neato`
+    comma # Run any binary from the repos with a comma `, cowsay neato`
-
+    gnome-decoder
-  # Gnome extension
+    tor-browser-bundle-bin
-  gnomeExtensions.quick-settings-audio-panel
+  ];
-  gnomeExtensions.tray-icons-reloaded
+}
-  gnomeExtensions.espresso
-  gnomeExtensions.pano
-
-  gnome-decoder
-
-  tor-browser-bundle-bin
-]

home/thunderbird.nix

@@ -1,6 +1,9 @@
-{enable}: {
+{...}: {
-  inherit enable;
+  config.programs.thunderbird = {
-  profiles.kristian = {
+    enable = true;
-    isDefault = true;
+
+    profiles.kristian = {
+      isDefault = true;
+    };
   };
 }

home/vscode.nix

@@ -1,64 +1,67 @@
-{
+{pkgs, ...}: {
-  enable,
+  config.programs.vscode = {
-  pkgs,
+    enable = true;
-}: {
-  inherit enable;
-  enableUpdateCheck = false;
-  enableExtensionUpdateCheck = false;
-  keybindings = [
-    {
-      key = "alt+a";
-      command = "editor.action.commentLine";
-      when = "editorTextFocus && !editorReadonly";
-    }
-  ];
-  extensions = with pkgs.vscode-extensions; [
-    jnoortheen.nix-ide
-    arrterian.nix-env-selector
-    mkhl.direnv
-    ms-python.python
-    ms-python.vscode-pylance
-    james-yu.latex-workshop
-    github.copilot
-    davidanson.vscode-markdownlint
-    tamasfe.even-better-toml
-    asciidoctor.asciidoctor-vscode
-  ];
-  userSettings = {
-    "window.menuBarVisibility" = "hidden";
-    "[nix]" = {
-      "editor.formatOnSave" = true;
-      "editor.formatOnSaveMode" = "file"; # modificationsIfAvailable does not work
-    };
-    "[python]" = {
-      "editor.formatOnSave" = true;
-      "editor.formatOnSaveMode" = "modificationsIfAvailable";
-    };
-    "[latex]" = {
-      "editor.formatOnSave" = true;
-      "editor.formatOnSaveMode" = "file"; # modificationsIfAvailable does not work
-    };
-    "[toml]" = {
-      "editor.formatOnSave" = true;
-      "editor.modificationsIfAvailable" = "file";
-    };
-    "python.formatting.autopep8Path" = "${pkgs.python311Packages.autopep8}/bin/autopep8";
-    "nix.enableLanguageServer" = true;
-    "nix.serverPath" = "${pkgs.nil}/bin/nil";
-    "nix.serverSettings" = {
-      nil = {
-        formatting = {command = ["${pkgs.alejandra}/bin/alejandra"];};
-      };
-    };
-    "direnv.path.executable" = "${pkgs.direnv}/bin/direnv";
-    "latex-workshop.latex.outDir" = "%DIR%/out";
 
-    "terminal.integrated.profiles.linux" = {
+    enableUpdateCheck = false;
-      "bash" = {
+    enableExtensionUpdateCheck = false;
-        "path" = "${pkgs.bashInteractive}/bin/bash";
+
-        "args" = [];
+    keybindings = [
+      {
+        key = "alt+a";
+        command = "editor.action.commentLine";
+        when = "editorTextFocus && !editorReadonly";
+      }
+    ];
+
+    extensions = with pkgs.vscode-extensions; [
+      jnoortheen.nix-ide
+      arrterian.nix-env-selector
+      mkhl.direnv
+      ms-python.python
+      ms-python.vscode-pylance
+      james-yu.latex-workshop
+      github.copilot
+      davidanson.vscode-markdownlint
+      tamasfe.even-better-toml
+      asciidoctor.asciidoctor-vscode
+    ];
+
+    userSettings = {
+      "window.menuBarVisibility" = "hidden";
+      "[nix]" = {
+        "editor.formatOnSave" = true;
+        "editor.formatOnSaveMode" = "file"; # modificationsIfAvailable does not work
       };
+      "[python]" = {
+        "editor.formatOnSave" = true;
+        "editor.formatOnSaveMode" = "modificationsIfAvailable";
+      };
+      "[latex]" = {
+        "editor.formatOnSave" = true;
+        "editor.formatOnSaveMode" = "file"; # modificationsIfAvailable does not work
+      };
+      "[toml]" = {
+        "editor.formatOnSave" = true;
+        "editor.modificationsIfAvailable" = "file";
+      };
+      "python.formatting.autopep8Path" = "${pkgs.python311Packages.autopep8}/bin/autopep8";
+      "nix.enableLanguageServer" = true;
+      "nix.serverPath" = "${pkgs.nil}/bin/nil";
+      "nix.serverSettings" = {
+        nil = {
+          formatting = {command = ["${pkgs.alejandra}/bin/alejandra"];};
+        };
+      };
+      "direnv.path.executable" = "${pkgs.direnv}/bin/direnv";
+      "latex-workshop.latex.outDir" = "%DIR%/out";
+
+      "terminal.integrated.profiles.linux" = {
+        "bash" = {
+          "path" = "${pkgs.bashInteractive}/bin/bash";
+          "args" = [];
+        };
+      };
+      "terminal.integrated.defaultProfile.linux" = "bash";
     };
-    "terminal.integrated.defaultProfile.linux" = "bash";
   };
 }