From 67d23bcd9ef90dc95899d45413066226183c5afd Mon Sep 17 00:00:00 2001 From: Julian Mutter Date: Thu, 1 Feb 2024 12:42:15 +0100 Subject: [PATCH] major restructuring for using snowfall --- home-manager/Readme.org => Readme.org | 0 flake.nix | 2 +- .../x86_64-linux/julian@aspi/default.nix | 0 .../laptop-nix.conf => laptop-nix.conf | 0 leftwm/themes/current | 1 - .../home/alacritty}/alacritty.toml | 0 .../home/alacritty/default.nix | 0 .../home/direnv/default.nix | 0 .../modules => modules}/home/i3/default.nix | 0 .../home/neovim/default.nix | 0 .../modules => modules}/home/rofi/default.nix | 0 .../home/topgrade/default.nix | 0 .../modules => modules}/home/zsh/default.nix | 0 .../home/zsh/dir-navigation.zsh | 0 .../home/zsh/functions.zsh | 0 .../home/zsh/key-bindings.zsh | 0 .../home/zsh/last-working-dir.zsh | 0 .../home/zsh/starship.toml | 0 nix/flake.lock | 104 ------------------ nix/flake.nix | 29 ----- .../home => non-nix}/alacritty/alacritty.toml | 0 direnvrc => non-nix/direnvrc | 0 .../emacs}/chemacs/.emacs-profiles.el | 0 {emacs => non-nix/emacs}/doom/config.el | 0 {emacs => non-nix/emacs}/doom/init.el | 0 .../emacs}/doom/org-agenda-files | 0 {emacs => non-nix/emacs}/doom/packages.el | 0 {emacs => non-nix/emacs}/spacemacs/.spacemacs | 0 .../fish}/.config/fish/config.fish | 0 .../fish}/.config/fish/fish_variables | 0 .../.config/fish/functions/fish_prompt.fish | 0 .../.config/fish/functions/handbrake.fish | 0 .../fish}/.config/fish/functions/vim.fish | 0 .../fish}/.config/fish/functions/vivado.fish | 0 {i3 => non-nix/i3}/.profile | 0 {i3 => non-nix/i3}/i3-scrot.conf | 0 {i3 => non-nix/i3}/i3/config | 0 {i3 => non-nix/i3}/i3/manjaro-default-config | 0 .../i3}/i3/scripts/display-layoutpicker | 0 .../i3}/i3/scripts/display-toggle-mirror | 0 .../i3}/i3/scripts/jupyter-calculator | 0 {i3 => non-nix/i3}/i3/scripts/mymatlab.sh | 0 {i3 => non-nix/i3}/i3/scripts/open-messaging | 0 {i3 => non-nix/i3}/i3/scripts/pulse_popup | 0 {i3 => non-nix/i3}/i3/scripts/rofi_calc | 0 {i3 => non-nix/i3}/i3/scripts/setupZoom | 0 .../workspace-chat-schildi-tele-rocket.json | 0 .../i3}/i3/workspace-chat-schildi-tele.json | 0 {i3 => non-nix/i3}/i3/workspace-chat.json | 0 {i3 => non-nix/i3}/i3/workspace-zoom.json | 0 {i3 => non-nix/i3}/i3blocks/activity | 0 {i3 => non-nix/i3}/i3blocks/calendar | 0 {i3 => non-nix/i3}/i3blocks/config | 0 {i3 => non-nix/i3}/i3blocks/dunst | 0 {i3 => non-nix/i3}/i3blocks/i3b-gate | 0 {i3 => non-nix/i3}/i3blocks/keyboard | 0 {i3 => non-nix/i3}/i3blocks/volume | 0 {i3 => non-nix/i3}/i3status-rust/config.toml | 0 {i3 => non-nix/i3}/rofi/config.rasi | 0 .../laptop}/acer-battery-health-mode.sh | 0 {leftwm => non-nix/leftwm}/config.toml | 0 .../leftwm}/scripts/dzen_exit_menu.pl | 0 {leftwm => non-nix/leftwm}/themes.toml | 0 .../leftwm}/themes/current.diff | 0 .../manjaro}/.config/mimeapps.list | 0 {manjaro => non-nix/manjaro}/.xprofile | 0 {mc => non-nix/mc}/mc.keymap | 0 {polybar => non-nix/polybar}/config.ini | 0 {polybar => non-nix/polybar}/startup.sh | 0 {starship => non-nix/starship}/starship.toml | 0 {vim => non-nix/vim}/.vimrc | 0 {vim => non-nix/vim}/init.vim | 0 .../xmonad}/build-x86_64-linux/Main.hi | Bin .../xmonad}/build-x86_64-linux/Main.o | Bin .../xmonad}/scripts/dzen_exit_menu.pl | 0 .../xmonad}/xmonad-x86_64-linux | Bin {xmonad => non-nix/xmonad}/xmonad.errors | 0 {xmonad => non-nix/xmonad}/xmonad.hi | Bin {xmonad => non-nix/xmonad}/xmonad.hs | 0 {xmonad => non-nix/xmonad}/xmonad.o | Bin {zsh => non-nix/zsh}/.zshrc | 0 {zsh => non-nix/zsh}/custom-plugins/fzf-z.zsh | 0 .../zsh}/custom-plugins/last-working-dir.zsh | 0 .../x86_64-linux/julian@kardorf/default.nix | 52 ++++----- .../hardware-configuration.nix | 0 .../x86_64-linux/julian@kardorf}/home.nix | 0 .../module.default.nix | 0 87 files changed, 24 insertions(+), 164 deletions(-) rename home-manager/Readme.org => Readme.org (100%) rename {home-manager/homes => homes}/x86_64-linux/julian@aspi/default.nix (100%) rename home-manager/laptop-nix.conf => laptop-nix.conf (100%) delete mode 160000 leftwm/themes/current rename {alacritty => modules/home/alacritty}/alacritty.toml (100%) rename {home-manager/modules => modules}/home/alacritty/default.nix (100%) rename {home-manager/modules => modules}/home/direnv/default.nix (100%) rename {home-manager/modules => modules}/home/i3/default.nix (100%) rename {home-manager/modules => modules}/home/neovim/default.nix (100%) rename {home-manager/modules => modules}/home/rofi/default.nix (100%) rename {home-manager/modules => modules}/home/topgrade/default.nix (100%) rename {home-manager/modules => modules}/home/zsh/default.nix (100%) rename {home-manager/modules => modules}/home/zsh/dir-navigation.zsh (100%) rename {home-manager/modules => modules}/home/zsh/functions.zsh (100%) rename {home-manager/modules => modules}/home/zsh/key-bindings.zsh (100%) rename {home-manager/modules => modules}/home/zsh/last-working-dir.zsh (100%) rename {home-manager/modules => modules}/home/zsh/starship.toml (100%) delete mode 100644 nix/flake.lock delete mode 100644 nix/flake.nix rename {home-manager/modules/home => non-nix}/alacritty/alacritty.toml (100%) rename direnvrc => non-nix/direnvrc (100%) rename {emacs => non-nix/emacs}/chemacs/.emacs-profiles.el (100%) rename {emacs => non-nix/emacs}/doom/config.el (100%) rename {emacs => non-nix/emacs}/doom/init.el (100%) rename {emacs => non-nix/emacs}/doom/org-agenda-files (100%) rename {emacs => non-nix/emacs}/doom/packages.el (100%) rename {emacs => non-nix/emacs}/spacemacs/.spacemacs (100%) rename {fish => non-nix/fish}/.config/fish/config.fish (100%) rename {fish => non-nix/fish}/.config/fish/fish_variables (100%) rename {fish => non-nix/fish}/.config/fish/functions/fish_prompt.fish (100%) rename {fish => non-nix/fish}/.config/fish/functions/handbrake.fish (100%) rename {fish => non-nix/fish}/.config/fish/functions/vim.fish (100%) rename {fish => non-nix/fish}/.config/fish/functions/vivado.fish (100%) rename {i3 => non-nix/i3}/.profile (100%) rename {i3 => non-nix/i3}/i3-scrot.conf (100%) rename {i3 => non-nix/i3}/i3/config (100%) rename {i3 => non-nix/i3}/i3/manjaro-default-config (100%) rename {i3 => non-nix/i3}/i3/scripts/display-layoutpicker (100%) rename {i3 => non-nix/i3}/i3/scripts/display-toggle-mirror (100%) rename {i3 => non-nix/i3}/i3/scripts/jupyter-calculator (100%) rename {i3 => non-nix/i3}/i3/scripts/mymatlab.sh (100%) rename {i3 => non-nix/i3}/i3/scripts/open-messaging (100%) rename {i3 => non-nix/i3}/i3/scripts/pulse_popup (100%) rename {i3 => non-nix/i3}/i3/scripts/rofi_calc (100%) rename {i3 => non-nix/i3}/i3/scripts/setupZoom (100%) rename {i3 => non-nix/i3}/i3/workspace-chat-schildi-tele-rocket.json (100%) rename {i3 => non-nix/i3}/i3/workspace-chat-schildi-tele.json (100%) rename {i3 => non-nix/i3}/i3/workspace-chat.json (100%) rename {i3 => non-nix/i3}/i3/workspace-zoom.json (100%) rename {i3 => non-nix/i3}/i3blocks/activity (100%) rename {i3 => non-nix/i3}/i3blocks/calendar (100%) rename {i3 => non-nix/i3}/i3blocks/config (100%) rename {i3 => non-nix/i3}/i3blocks/dunst (100%) rename {i3 => non-nix/i3}/i3blocks/i3b-gate (100%) rename {i3 => non-nix/i3}/i3blocks/keyboard (100%) rename {i3 => non-nix/i3}/i3blocks/volume (100%) rename {i3 => non-nix/i3}/i3status-rust/config.toml (100%) rename {i3 => non-nix/i3}/rofi/config.rasi (100%) rename {laptop => non-nix/laptop}/acer-battery-health-mode.sh (100%) rename {leftwm => non-nix/leftwm}/config.toml (100%) rename {leftwm => non-nix/leftwm}/scripts/dzen_exit_menu.pl (100%) rename {leftwm => non-nix/leftwm}/themes.toml (100%) rename {leftwm => non-nix/leftwm}/themes/current.diff (100%) rename {manjaro => non-nix/manjaro}/.config/mimeapps.list (100%) rename {manjaro => non-nix/manjaro}/.xprofile (100%) rename {mc => non-nix/mc}/mc.keymap (100%) rename {polybar => non-nix/polybar}/config.ini (100%) rename {polybar => non-nix/polybar}/startup.sh (100%) rename {starship => non-nix/starship}/starship.toml (100%) rename {vim => non-nix/vim}/.vimrc (100%) rename {vim => non-nix/vim}/init.vim (100%) rename {xmonad => non-nix/xmonad}/build-x86_64-linux/Main.hi (100%) rename {xmonad => non-nix/xmonad}/build-x86_64-linux/Main.o (100%) rename {xmonad => non-nix/xmonad}/scripts/dzen_exit_menu.pl (100%) rename {xmonad => non-nix/xmonad}/xmonad-x86_64-linux (100%) rename {xmonad => non-nix/xmonad}/xmonad.errors (100%) rename {xmonad => non-nix/xmonad}/xmonad.hi (100%) rename {xmonad => non-nix/xmonad}/xmonad.hs (100%) rename {xmonad => non-nix/xmonad}/xmonad.o (100%) rename {zsh => non-nix/zsh}/.zshrc (100%) rename {zsh => non-nix/zsh}/custom-plugins/fzf-z.zsh (100%) rename {zsh => non-nix/zsh}/custom-plugins/last-working-dir.zsh (100%) rename nix/configuration.nix => systems/x86_64-linux/julian@kardorf/default.nix (91%) rename {nix => systems/x86_64-linux/julian@kardorf}/hardware-configuration.nix (100%) rename {nix => systems/x86_64-linux/julian@kardorf}/home.nix (100%) rename {home-manager/templates => templates}/module.default.nix (100%) diff --git a/home-manager/Readme.org b/Readme.org similarity index 100% rename from home-manager/Readme.org rename to Readme.org diff --git a/flake.nix b/flake.nix index 1e1dccd..a12bb19 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ snowfall = { # The root of the snowfall config - root = ./home-manager; + root = ./.; # lib namespace namepace = "frajul"; diff --git a/home-manager/homes/x86_64-linux/julian@aspi/default.nix b/homes/x86_64-linux/julian@aspi/default.nix similarity index 100% rename from home-manager/homes/x86_64-linux/julian@aspi/default.nix rename to homes/x86_64-linux/julian@aspi/default.nix diff --git a/home-manager/laptop-nix.conf b/laptop-nix.conf similarity index 100% rename from home-manager/laptop-nix.conf rename to laptop-nix.conf diff --git a/leftwm/themes/current b/leftwm/themes/current deleted file mode 160000 index 129901d..0000000 --- a/leftwm/themes/current +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 129901d8aa23bbbcacebb44aebe62aaee441c9cf diff --git a/alacritty/alacritty.toml b/modules/home/alacritty/alacritty.toml similarity index 100% rename from alacritty/alacritty.toml rename to modules/home/alacritty/alacritty.toml diff --git a/home-manager/modules/home/alacritty/default.nix b/modules/home/alacritty/default.nix similarity index 100% rename from home-manager/modules/home/alacritty/default.nix rename to modules/home/alacritty/default.nix diff --git a/home-manager/modules/home/direnv/default.nix b/modules/home/direnv/default.nix similarity index 100% rename from home-manager/modules/home/direnv/default.nix rename to modules/home/direnv/default.nix diff --git a/home-manager/modules/home/i3/default.nix b/modules/home/i3/default.nix similarity index 100% rename from home-manager/modules/home/i3/default.nix rename to modules/home/i3/default.nix diff --git a/home-manager/modules/home/neovim/default.nix b/modules/home/neovim/default.nix similarity index 100% rename from home-manager/modules/home/neovim/default.nix rename to modules/home/neovim/default.nix diff --git a/home-manager/modules/home/rofi/default.nix b/modules/home/rofi/default.nix similarity index 100% rename from home-manager/modules/home/rofi/default.nix rename to modules/home/rofi/default.nix diff --git a/home-manager/modules/home/topgrade/default.nix b/modules/home/topgrade/default.nix similarity index 100% rename from home-manager/modules/home/topgrade/default.nix rename to modules/home/topgrade/default.nix diff --git a/home-manager/modules/home/zsh/default.nix b/modules/home/zsh/default.nix similarity index 100% rename from home-manager/modules/home/zsh/default.nix rename to modules/home/zsh/default.nix diff --git a/home-manager/modules/home/zsh/dir-navigation.zsh b/modules/home/zsh/dir-navigation.zsh similarity index 100% rename from home-manager/modules/home/zsh/dir-navigation.zsh rename to modules/home/zsh/dir-navigation.zsh diff --git a/home-manager/modules/home/zsh/functions.zsh b/modules/home/zsh/functions.zsh similarity index 100% rename from home-manager/modules/home/zsh/functions.zsh rename to modules/home/zsh/functions.zsh diff --git a/home-manager/modules/home/zsh/key-bindings.zsh b/modules/home/zsh/key-bindings.zsh similarity index 100% rename from home-manager/modules/home/zsh/key-bindings.zsh rename to modules/home/zsh/key-bindings.zsh diff --git a/home-manager/modules/home/zsh/last-working-dir.zsh b/modules/home/zsh/last-working-dir.zsh similarity index 100% rename from home-manager/modules/home/zsh/last-working-dir.zsh rename to modules/home/zsh/last-working-dir.zsh diff --git a/home-manager/modules/home/zsh/starship.toml b/modules/home/zsh/starship.toml similarity index 100% rename from home-manager/modules/home/zsh/starship.toml rename to modules/home/zsh/starship.toml diff --git a/nix/flake.lock b/nix/flake.lock deleted file mode 100644 index 3e7a0fe..0000000 --- a/nix/flake.lock +++ /dev/null @@ -1,104 +0,0 @@ -{ - "nodes": { - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1702195668, - "narHash": "sha256-Lxmjez0nfNBptdqV5GsXKm7Bb7swjGsrxiLxWJu0tL8=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "33110fb3c7fe6a94b98b641866a5eddb64b7c23f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-23.05", - "repo": "home-manager", - "type": "github" - } - }, - "nix-matlab": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1704121315, - "narHash": "sha256-gsv9E8o3iF4VamGDNRHT4H0e29BB+0pZRHfP/oAQqjo=", - "owner": "doronbehar", - "repo": "nix-matlab", - "rev": "2e61e11473c8b4e83b62308b36ad2118a84177cb", - "type": "gitlab" - }, - "original": { - "owner": "doronbehar", - "repo": "nix-matlab", - "type": "gitlab" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1704018918, - "narHash": "sha256-erjg/HrpC9liEfm7oLqb8GXCqsxaFwIIPqCsknW5aFY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2c9c58e98243930f8cb70387934daa4bc8b00373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "home-manager": "home-manager", - "nix-matlab": "nix-matlab", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/nix/flake.nix b/nix/flake.nix deleted file mode 100644 index c471d8b..0000000 --- a/nix/flake.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; - inputs.nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; - - inputs.home-manager = { - url = "github:nix-community/home-manager/release-23.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - inputs.nix-matlab = { - url = "gitlab:doronbehar/nix-matlab"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - outputs = { self, nixpkgs, nix-matlab, ... }@inputs: - let system = "x86_64-linux"; - in { - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - # inherit system; - specialArgs = { inherit inputs system; }; - modules = [ - # Overlays-module makes "pkgs.unstable" available in configuration.nix - ({ config, pkgs, ... }: { - nixpkgs.overlays = [ nix-matlab.overlay ]; - }) - ./configuration.nix - ]; - }; - }; -} diff --git a/home-manager/modules/home/alacritty/alacritty.toml b/non-nix/alacritty/alacritty.toml similarity index 100% rename from home-manager/modules/home/alacritty/alacritty.toml rename to non-nix/alacritty/alacritty.toml diff --git a/direnvrc b/non-nix/direnvrc similarity index 100% rename from direnvrc rename to non-nix/direnvrc diff --git a/emacs/chemacs/.emacs-profiles.el b/non-nix/emacs/chemacs/.emacs-profiles.el similarity index 100% rename from emacs/chemacs/.emacs-profiles.el rename to non-nix/emacs/chemacs/.emacs-profiles.el diff --git a/emacs/doom/config.el b/non-nix/emacs/doom/config.el similarity index 100% rename from emacs/doom/config.el rename to non-nix/emacs/doom/config.el diff --git a/emacs/doom/init.el b/non-nix/emacs/doom/init.el similarity index 100% rename from emacs/doom/init.el rename to non-nix/emacs/doom/init.el diff --git a/emacs/doom/org-agenda-files b/non-nix/emacs/doom/org-agenda-files similarity index 100% rename from emacs/doom/org-agenda-files rename to non-nix/emacs/doom/org-agenda-files diff --git a/emacs/doom/packages.el b/non-nix/emacs/doom/packages.el similarity index 100% rename from emacs/doom/packages.el rename to non-nix/emacs/doom/packages.el diff --git a/emacs/spacemacs/.spacemacs b/non-nix/emacs/spacemacs/.spacemacs similarity index 100% rename from emacs/spacemacs/.spacemacs rename to non-nix/emacs/spacemacs/.spacemacs diff --git a/fish/.config/fish/config.fish b/non-nix/fish/.config/fish/config.fish similarity index 100% rename from fish/.config/fish/config.fish rename to non-nix/fish/.config/fish/config.fish diff --git a/fish/.config/fish/fish_variables b/non-nix/fish/.config/fish/fish_variables similarity index 100% rename from fish/.config/fish/fish_variables rename to non-nix/fish/.config/fish/fish_variables diff --git a/fish/.config/fish/functions/fish_prompt.fish b/non-nix/fish/.config/fish/functions/fish_prompt.fish similarity index 100% rename from fish/.config/fish/functions/fish_prompt.fish rename to non-nix/fish/.config/fish/functions/fish_prompt.fish diff --git a/fish/.config/fish/functions/handbrake.fish b/non-nix/fish/.config/fish/functions/handbrake.fish similarity index 100% rename from fish/.config/fish/functions/handbrake.fish rename to non-nix/fish/.config/fish/functions/handbrake.fish diff --git a/fish/.config/fish/functions/vim.fish b/non-nix/fish/.config/fish/functions/vim.fish similarity index 100% rename from fish/.config/fish/functions/vim.fish rename to non-nix/fish/.config/fish/functions/vim.fish diff --git a/fish/.config/fish/functions/vivado.fish b/non-nix/fish/.config/fish/functions/vivado.fish similarity index 100% rename from fish/.config/fish/functions/vivado.fish rename to non-nix/fish/.config/fish/functions/vivado.fish diff --git a/i3/.profile b/non-nix/i3/.profile similarity index 100% rename from i3/.profile rename to non-nix/i3/.profile diff --git a/i3/i3-scrot.conf b/non-nix/i3/i3-scrot.conf similarity index 100% rename from i3/i3-scrot.conf rename to non-nix/i3/i3-scrot.conf diff --git a/i3/i3/config b/non-nix/i3/i3/config similarity index 100% rename from i3/i3/config rename to non-nix/i3/i3/config diff --git a/i3/i3/manjaro-default-config b/non-nix/i3/i3/manjaro-default-config similarity index 100% rename from i3/i3/manjaro-default-config rename to non-nix/i3/i3/manjaro-default-config diff --git a/i3/i3/scripts/display-layoutpicker b/non-nix/i3/i3/scripts/display-layoutpicker similarity index 100% rename from i3/i3/scripts/display-layoutpicker rename to non-nix/i3/i3/scripts/display-layoutpicker diff --git a/i3/i3/scripts/display-toggle-mirror b/non-nix/i3/i3/scripts/display-toggle-mirror similarity index 100% rename from i3/i3/scripts/display-toggle-mirror rename to non-nix/i3/i3/scripts/display-toggle-mirror diff --git a/i3/i3/scripts/jupyter-calculator b/non-nix/i3/i3/scripts/jupyter-calculator similarity index 100% rename from i3/i3/scripts/jupyter-calculator rename to non-nix/i3/i3/scripts/jupyter-calculator diff --git a/i3/i3/scripts/mymatlab.sh b/non-nix/i3/i3/scripts/mymatlab.sh similarity index 100% rename from i3/i3/scripts/mymatlab.sh rename to non-nix/i3/i3/scripts/mymatlab.sh diff --git a/i3/i3/scripts/open-messaging b/non-nix/i3/i3/scripts/open-messaging similarity index 100% rename from i3/i3/scripts/open-messaging rename to non-nix/i3/i3/scripts/open-messaging diff --git a/i3/i3/scripts/pulse_popup b/non-nix/i3/i3/scripts/pulse_popup similarity index 100% rename from i3/i3/scripts/pulse_popup rename to non-nix/i3/i3/scripts/pulse_popup diff --git a/i3/i3/scripts/rofi_calc b/non-nix/i3/i3/scripts/rofi_calc similarity index 100% rename from i3/i3/scripts/rofi_calc rename to non-nix/i3/i3/scripts/rofi_calc diff --git a/i3/i3/scripts/setupZoom b/non-nix/i3/i3/scripts/setupZoom similarity index 100% rename from i3/i3/scripts/setupZoom rename to non-nix/i3/i3/scripts/setupZoom diff --git a/i3/i3/workspace-chat-schildi-tele-rocket.json b/non-nix/i3/i3/workspace-chat-schildi-tele-rocket.json similarity index 100% rename from i3/i3/workspace-chat-schildi-tele-rocket.json rename to non-nix/i3/i3/workspace-chat-schildi-tele-rocket.json diff --git a/i3/i3/workspace-chat-schildi-tele.json b/non-nix/i3/i3/workspace-chat-schildi-tele.json similarity index 100% rename from i3/i3/workspace-chat-schildi-tele.json rename to non-nix/i3/i3/workspace-chat-schildi-tele.json diff --git a/i3/i3/workspace-chat.json b/non-nix/i3/i3/workspace-chat.json similarity index 100% rename from i3/i3/workspace-chat.json rename to non-nix/i3/i3/workspace-chat.json diff --git a/i3/i3/workspace-zoom.json b/non-nix/i3/i3/workspace-zoom.json similarity index 100% rename from i3/i3/workspace-zoom.json rename to non-nix/i3/i3/workspace-zoom.json diff --git a/i3/i3blocks/activity b/non-nix/i3/i3blocks/activity similarity index 100% rename from i3/i3blocks/activity rename to non-nix/i3/i3blocks/activity diff --git a/i3/i3blocks/calendar b/non-nix/i3/i3blocks/calendar similarity index 100% rename from i3/i3blocks/calendar rename to non-nix/i3/i3blocks/calendar diff --git a/i3/i3blocks/config b/non-nix/i3/i3blocks/config similarity index 100% rename from i3/i3blocks/config rename to non-nix/i3/i3blocks/config diff --git a/i3/i3blocks/dunst b/non-nix/i3/i3blocks/dunst similarity index 100% rename from i3/i3blocks/dunst rename to non-nix/i3/i3blocks/dunst diff --git a/i3/i3blocks/i3b-gate b/non-nix/i3/i3blocks/i3b-gate similarity index 100% rename from i3/i3blocks/i3b-gate rename to non-nix/i3/i3blocks/i3b-gate diff --git a/i3/i3blocks/keyboard b/non-nix/i3/i3blocks/keyboard similarity index 100% rename from i3/i3blocks/keyboard rename to non-nix/i3/i3blocks/keyboard diff --git a/i3/i3blocks/volume b/non-nix/i3/i3blocks/volume similarity index 100% rename from i3/i3blocks/volume rename to non-nix/i3/i3blocks/volume diff --git a/i3/i3status-rust/config.toml b/non-nix/i3/i3status-rust/config.toml similarity index 100% rename from i3/i3status-rust/config.toml rename to non-nix/i3/i3status-rust/config.toml diff --git a/i3/rofi/config.rasi b/non-nix/i3/rofi/config.rasi similarity index 100% rename from i3/rofi/config.rasi rename to non-nix/i3/rofi/config.rasi diff --git a/laptop/acer-battery-health-mode.sh b/non-nix/laptop/acer-battery-health-mode.sh similarity index 100% rename from laptop/acer-battery-health-mode.sh rename to non-nix/laptop/acer-battery-health-mode.sh diff --git a/leftwm/config.toml b/non-nix/leftwm/config.toml similarity index 100% rename from leftwm/config.toml rename to non-nix/leftwm/config.toml diff --git a/leftwm/scripts/dzen_exit_menu.pl b/non-nix/leftwm/scripts/dzen_exit_menu.pl similarity index 100% rename from leftwm/scripts/dzen_exit_menu.pl rename to non-nix/leftwm/scripts/dzen_exit_menu.pl diff --git a/leftwm/themes.toml b/non-nix/leftwm/themes.toml similarity index 100% rename from leftwm/themes.toml rename to non-nix/leftwm/themes.toml diff --git a/leftwm/themes/current.diff b/non-nix/leftwm/themes/current.diff similarity index 100% rename from leftwm/themes/current.diff rename to non-nix/leftwm/themes/current.diff diff --git a/manjaro/.config/mimeapps.list b/non-nix/manjaro/.config/mimeapps.list similarity index 100% rename from manjaro/.config/mimeapps.list rename to non-nix/manjaro/.config/mimeapps.list diff --git a/manjaro/.xprofile b/non-nix/manjaro/.xprofile similarity index 100% rename from manjaro/.xprofile rename to non-nix/manjaro/.xprofile diff --git a/mc/mc.keymap b/non-nix/mc/mc.keymap similarity index 100% rename from mc/mc.keymap rename to non-nix/mc/mc.keymap diff --git a/polybar/config.ini b/non-nix/polybar/config.ini similarity index 100% rename from polybar/config.ini rename to non-nix/polybar/config.ini diff --git a/polybar/startup.sh b/non-nix/polybar/startup.sh similarity index 100% rename from polybar/startup.sh rename to non-nix/polybar/startup.sh diff --git a/starship/starship.toml b/non-nix/starship/starship.toml similarity index 100% rename from starship/starship.toml rename to non-nix/starship/starship.toml diff --git a/vim/.vimrc b/non-nix/vim/.vimrc similarity index 100% rename from vim/.vimrc rename to non-nix/vim/.vimrc diff --git a/vim/init.vim b/non-nix/vim/init.vim similarity index 100% rename from vim/init.vim rename to non-nix/vim/init.vim diff --git a/xmonad/build-x86_64-linux/Main.hi b/non-nix/xmonad/build-x86_64-linux/Main.hi similarity index 100% rename from xmonad/build-x86_64-linux/Main.hi rename to non-nix/xmonad/build-x86_64-linux/Main.hi diff --git a/xmonad/build-x86_64-linux/Main.o b/non-nix/xmonad/build-x86_64-linux/Main.o similarity index 100% rename from xmonad/build-x86_64-linux/Main.o rename to non-nix/xmonad/build-x86_64-linux/Main.o diff --git a/xmonad/scripts/dzen_exit_menu.pl b/non-nix/xmonad/scripts/dzen_exit_menu.pl similarity index 100% rename from xmonad/scripts/dzen_exit_menu.pl rename to non-nix/xmonad/scripts/dzen_exit_menu.pl diff --git a/xmonad/xmonad-x86_64-linux b/non-nix/xmonad/xmonad-x86_64-linux similarity index 100% rename from xmonad/xmonad-x86_64-linux rename to non-nix/xmonad/xmonad-x86_64-linux diff --git a/xmonad/xmonad.errors b/non-nix/xmonad/xmonad.errors similarity index 100% rename from xmonad/xmonad.errors rename to non-nix/xmonad/xmonad.errors diff --git a/xmonad/xmonad.hi b/non-nix/xmonad/xmonad.hi similarity index 100% rename from xmonad/xmonad.hi rename to non-nix/xmonad/xmonad.hi diff --git a/xmonad/xmonad.hs b/non-nix/xmonad/xmonad.hs similarity index 100% rename from xmonad/xmonad.hs rename to non-nix/xmonad/xmonad.hs diff --git a/xmonad/xmonad.o b/non-nix/xmonad/xmonad.o similarity index 100% rename from xmonad/xmonad.o rename to non-nix/xmonad/xmonad.o diff --git a/zsh/.zshrc b/non-nix/zsh/.zshrc similarity index 100% rename from zsh/.zshrc rename to non-nix/zsh/.zshrc diff --git a/zsh/custom-plugins/fzf-z.zsh b/non-nix/zsh/custom-plugins/fzf-z.zsh similarity index 100% rename from zsh/custom-plugins/fzf-z.zsh rename to non-nix/zsh/custom-plugins/fzf-z.zsh diff --git a/zsh/custom-plugins/last-working-dir.zsh b/non-nix/zsh/custom-plugins/last-working-dir.zsh similarity index 100% rename from zsh/custom-plugins/last-working-dir.zsh rename to non-nix/zsh/custom-plugins/last-working-dir.zsh diff --git a/nix/configuration.nix b/systems/x86_64-linux/julian@kardorf/default.nix similarity index 91% rename from nix/configuration.nix rename to systems/x86_64-linux/julian@kardorf/default.nix index fa9fa45..2b6380f 100644 --- a/nix/configuration.nix +++ b/systems/x86_64-linux/julian@kardorf/default.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ inputs, config, pkgs, ... }: +{ lib, inputs, config, pkgs, ... }: let python-packages = ps: with ps; [ ]; in rec { @@ -18,23 +18,21 @@ in rec { users.julian = import ./home.nix; }; - nix.buildMachines = [ { - hostName = "192.168.3.118"; - system = "x86_64-linux"; - protocol = "ssh"; - # if the builder supports building for multiple architectures, - # replace the previous line by, e.g. - # systems = ["x86_64-linux" "aarch64-linux"]; - maxJobs = 4; - speedFactor = 3; - supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; - mandatoryFeatures = [ ]; -}] ; - nix.distributedBuilds = true; - # optional, useful when the builder has a faster internet connection than yours - nix.extraOptions = '' - builders-use-substitutes = true - ''; + nix.buildMachines = [{ + hostName = "192.168.3.118"; + system = "x86_64-linux"; + protocol = "ssh"; + # if the builder supports building for multiple architectures, + # replace the previous line by, e.g. + # systems = ["x86_64-linux" "aarch64-linux"]; + maxJobs = 4; + speedFactor = 3; + supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; + mandatoryFeatures = [ ]; + }]; + nix.distributedBuilds = true; + # optional, useful when the builder has a faster internet connection than yours + nix.extraOptions = " builders-use-substitutes = true\n"; # Bootloader # Use this for simple nix boot menu, if no dual boot required @@ -82,13 +80,11 @@ in rec { # Setup binary caches nix.settings = { - substituters = [ - "https://nix-community.cachix.org" - "https://cache.nixos.org/" - ]; - trusted-public-keys = [ - "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" - ]; + substituters = + [ "https://nix-community.cachix.org" "https://cache.nixos.org/" ]; + trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + ]; }; # Enable the X11 windowing system. @@ -206,9 +202,7 @@ in rec { # Allow unfree packages nixpkgs.config.allowUnfree = true; nixpkgs.config.nvidia.acceptLicense = true; - nixpkgs.config.permittedInsecurePackages = [ - "electron-24.8.6" - ]; + nixpkgs.config.permittedInsecurePackages = [ "electron-24.8.6" ]; environment.etc."manual-links/xfce4-notifyd".source = "${pkgs.xfce.xfce4-notifyd}/lib/xfce4/notifyd/xfce4-notifyd"; @@ -386,7 +380,7 @@ in rec { audible-cli - cudaPackages.cudatoolkit + cudaPackages.cudatoolkit openmvg colmapWithCuda ]; diff --git a/nix/hardware-configuration.nix b/systems/x86_64-linux/julian@kardorf/hardware-configuration.nix similarity index 100% rename from nix/hardware-configuration.nix rename to systems/x86_64-linux/julian@kardorf/hardware-configuration.nix diff --git a/nix/home.nix b/systems/x86_64-linux/julian@kardorf/home.nix similarity index 100% rename from nix/home.nix rename to systems/x86_64-linux/julian@kardorf/home.nix diff --git a/home-manager/templates/module.default.nix b/templates/module.default.nix similarity index 100% rename from home-manager/templates/module.default.nix rename to templates/module.default.nix