From 0ff29aca1a24636c6cca2d65e76e42471bf847c2 Mon Sep 17 00:00:00 2001 From: 4Lost Date: Sun, 3 Mar 2024 12:35:44 +0100 Subject: [PATCH] restructure folders --- configuration.nix | 30 ++++++++++--------- home/{TODOS.txt => TODOS.md} | 2 ++ home/default.nix | 7 +---- .../neovim/lua/plugins/obsidian-nvim.lua | 9 ++++-- home/{programs => themes}/catppuccin-sddm.nix | 0 5 files changed, 25 insertions(+), 23 deletions(-) rename home/{TODOS.txt => TODOS.md} (98%) rename home/{programs => themes}/catppuccin-sddm.nix (100%) diff --git a/configuration.nix b/configuration.nix index 4ab2b90..be089b1 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,19 +1,20 @@ { config, lib, pkgs, ... }: { - imports = [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + # Include the results of the hardware scan. + imports = [ ./hardware-configuration.nix ]; # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; - networking.hostName = "eliasLaptop"; # Define your hostname. - # Pick only one of the below networking options. - #networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - networking.networkmanager.enable = - true; # Easiest to use and most distros use this by default. + # Define your hostname. + networking.hostName = "eliasLaptop"; + + # Use NetworkManager for networking. + networking.networkmanager.enable = true; # Set your time zone. time.timeZone = "Europe/Berlin"; @@ -68,17 +69,18 @@ }; environment.systemPackages = with pkgs; [ - (libsForQt5.callPackage ./home/programs/catppuccin-sddm.nix { }) + (libsForQt5.callPackage ./home/themes/catppuccin-sddm.nix { }) git - #neovim wget curl alacritty dmenu ]; - + # Enable zsh for setting it as shell for users. programs.zsh.enable = true; - system.stateVersion = "23.11"; # Do not change!!!! + + # Set stateVersion. Leave it as set. + system.stateVersion = "23.11"; } diff --git a/home/TODOS.txt b/home/TODOS.md similarity index 98% rename from home/TODOS.txt rename to home/TODOS.md index 44dac49..9635aa6 100644 --- a/home/TODOS.txt +++ b/home/TODOS.md @@ -1,3 +1,5 @@ + + Zusatz: - firefox Bookmarks neu - obsidian vaults einrichten in home/programs/neovim/lua/plugins/obsidian.lua diff --git a/home/default.nix b/home/default.nix index 437206c..93c198f 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,10 +1,7 @@ { config, pkgs, ... }: { - imports = [ - ./programs - ./services - ]; + imports = [ ./programs ./services ]; home = { username = "elias"; homeDirectory = "/home/elias"; @@ -28,9 +25,7 @@ firefox #signal-desktop #telegram-desktop - xfce.thunar # zathura - xfce.xfconf ]; # environment.shells = [ pkgs.zsh ]; diff --git a/home/programs/neovim/lua/plugins/obsidian-nvim.lua b/home/programs/neovim/lua/plugins/obsidian-nvim.lua index 86c749b..e83a868 100644 --- a/home/programs/neovim/lua/plugins/obsidian-nvim.lua +++ b/home/programs/neovim/lua/plugins/obsidian-nvim.lua @@ -3,8 +3,8 @@ return { "epwalsh/obsidian.nvim", lazy = true, event = { - "BufReadPre " .. vim.fn.expand("~") .. "/Notes/**.md", - "BufNewFile " .. vim.fn.expand("~") .. "/Notes/**.md", + "BufReadPre " .. vim.fn.expand("~") .. "**.md", + "BufNewFile " .. vim.fn.expand("~") .. "**.md", }, dependencies = { "nvim-lua/plenary.nvim", @@ -30,7 +30,10 @@ return { }, }, }) + function OpenMarkdownPreview(url) + execute "silent ! firefox --new-window " . a:url + endfunction + let g:mkdp_browserfunc = 'OpenMarkdownPreview' end, }, } - diff --git a/home/programs/catppuccin-sddm.nix b/home/themes/catppuccin-sddm.nix similarity index 100% rename from home/programs/catppuccin-sddm.nix rename to home/themes/catppuccin-sddm.nix