From ac9bc5772e3a7ad9205f63decb28ff1218d29593 Mon Sep 17 00:00:00 2001 From: Random936 Date: Fri, 17 May 2024 15:22:37 -0700 Subject: [PATCH] Moved dotfiles to new location for switch to nix --- .Xmodmap => dotfiles/.Xmodmap | 0 .Xresources => dotfiles/.Xresources | 0 {.config => dotfiles/.config}/bspwm/bspwmrc | 0 {.config => dotfiles/.config}/bspwm/sxhkdrc | 0 {.config => dotfiles/.config}/compton.conf | 0 {.config => dotfiles/.config}/dunst/dunstrc | 0 {.config => dotfiles/.config}/i3/config | 0 .../.config}/i3status/i3status.conf.desktop | 0 .../.config}/i3status/i3status.conf.laptop | 0 {.config => dotfiles/.config}/nvim/.vimrc | 0 .../.config}/nvim/coc-settings.json | 0 {.config => dotfiles/.config}/nvim/init.vim | 0 .../.config}/polybar/config.ini | 0 .../.config}/rofi/config.rasi | 0 .emacs => dotfiles/.emacs | 0 {.emacs.d => dotfiles/.emacs.d}/config.org | 0 {.emacs.d => dotfiles/.emacs.d}/email.org | 0 {.emacs.d => dotfiles/.emacs.d}/exwm.org | 0 {.emacs.d => dotfiles/.emacs.d}/functions.org | 0 {.emacs.d => dotfiles/.emacs.d}/lsp.org | 0 {.emacs.d => dotfiles/.emacs.d}/org.org | 0 {.emacs.d => dotfiles/.emacs.d}/start-exwm.sh | 0 {.emacs.d => dotfiles/.emacs.d}/terminal.org | 0 {.gnupg => dotfiles/.gnupg}/gpg-agent.conf | 0 .../.local}/share/applications/exwm.desktop | 0 .../.local}/share/fonts/FiraCode-Bold.ttf | Bin .../.local}/share/fonts/FiraCode-Light.ttf | Bin .../.local}/share/fonts/FiraCode-Medium.ttf | Bin .../.local}/share/fonts/FiraCode-Regular.ttf | Bin .../.local}/share/fonts/FiraCode-Retina.ttf | Bin .../.local}/share/fonts/FiraCode-SemiBold.ttf | Bin .../share/fonts/MesloLGS NF Bold Italic.ttf | Bin .../.local}/share/fonts/MesloLGS NF Bold.ttf | Bin .../share/fonts/MesloLGS NF Italic.ttf | Bin .../share/fonts/MesloLGS NF Regular.ttf | Bin .mbsyncrc => dotfiles/.mbsyncrc | 0 .p10k.zsh => dotfiles/.p10k.zsh | 0 .../.screenlayout}/launch.sh | 0 .../.screenlayout}/wallpapers.sh | 0 .../.scripts}/autostart_desktop.sh | 0 {.scripts => dotfiles/.scripts}/brightness.sh | 0 .../.stow-local-ignore | 0 .tmux.conf => dotfiles/.tmux.conf | 0 .xinitrc => dotfiles/.xinitrc | 0 .zshrc => dotfiles/.zshrc | 0 flake.lock | 49 ++++++++++++++++++ flake.nix | 27 ++++++++++ 47 files changed, 76 insertions(+) rename .Xmodmap => dotfiles/.Xmodmap (100%) rename .Xresources => dotfiles/.Xresources (100%) rename {.config => dotfiles/.config}/bspwm/bspwmrc (100%) rename {.config => dotfiles/.config}/bspwm/sxhkdrc (100%) rename {.config => dotfiles/.config}/compton.conf (100%) rename {.config => dotfiles/.config}/dunst/dunstrc (100%) rename {.config => dotfiles/.config}/i3/config (100%) rename {.config => dotfiles/.config}/i3status/i3status.conf.desktop (100%) rename {.config => dotfiles/.config}/i3status/i3status.conf.laptop (100%) rename {.config => dotfiles/.config}/nvim/.vimrc (100%) rename {.config => dotfiles/.config}/nvim/coc-settings.json (100%) rename {.config => dotfiles/.config}/nvim/init.vim (100%) rename {.config => dotfiles/.config}/polybar/config.ini (100%) rename {.config => dotfiles/.config}/rofi/config.rasi (100%) rename .emacs => dotfiles/.emacs (100%) rename {.emacs.d => dotfiles/.emacs.d}/config.org (100%) rename {.emacs.d => dotfiles/.emacs.d}/email.org (100%) rename {.emacs.d => dotfiles/.emacs.d}/exwm.org (100%) rename {.emacs.d => dotfiles/.emacs.d}/functions.org (100%) rename {.emacs.d => dotfiles/.emacs.d}/lsp.org (100%) rename {.emacs.d => dotfiles/.emacs.d}/org.org (100%) rename {.emacs.d => dotfiles/.emacs.d}/start-exwm.sh (100%) rename {.emacs.d => dotfiles/.emacs.d}/terminal.org (100%) rename {.gnupg => dotfiles/.gnupg}/gpg-agent.conf (100%) rename {.local => dotfiles/.local}/share/applications/exwm.desktop (100%) rename {.local => dotfiles/.local}/share/fonts/FiraCode-Bold.ttf (100%) rename {.local => dotfiles/.local}/share/fonts/FiraCode-Light.ttf (100%) rename {.local => dotfiles/.local}/share/fonts/FiraCode-Medium.ttf (100%) rename {.local => dotfiles/.local}/share/fonts/FiraCode-Regular.ttf (100%) rename {.local => dotfiles/.local}/share/fonts/FiraCode-Retina.ttf (100%) rename {.local => dotfiles/.local}/share/fonts/FiraCode-SemiBold.ttf (100%) rename {.local => dotfiles/.local}/share/fonts/MesloLGS NF Bold Italic.ttf (100%) rename {.local => dotfiles/.local}/share/fonts/MesloLGS NF Bold.ttf (100%) rename {.local => dotfiles/.local}/share/fonts/MesloLGS NF Italic.ttf (100%) rename {.local => dotfiles/.local}/share/fonts/MesloLGS NF Regular.ttf (100%) rename .mbsyncrc => dotfiles/.mbsyncrc (100%) rename .p10k.zsh => dotfiles/.p10k.zsh (100%) rename {.screenlayout => dotfiles/.screenlayout}/launch.sh (100%) rename {.screenlayout => dotfiles/.screenlayout}/wallpapers.sh (100%) rename {.scripts => dotfiles/.scripts}/autostart_desktop.sh (100%) rename {.scripts => dotfiles/.scripts}/brightness.sh (100%) rename .stow-local-ignore => dotfiles/.stow-local-ignore (100%) rename .tmux.conf => dotfiles/.tmux.conf (100%) rename .xinitrc => dotfiles/.xinitrc (100%) rename .zshrc => dotfiles/.zshrc (100%) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/.Xmodmap b/dotfiles/.Xmodmap similarity index 100% rename from .Xmodmap rename to dotfiles/.Xmodmap diff --git a/.Xresources b/dotfiles/.Xresources similarity index 100% rename from .Xresources rename to dotfiles/.Xresources diff --git a/.config/bspwm/bspwmrc b/dotfiles/.config/bspwm/bspwmrc similarity index 100% rename from .config/bspwm/bspwmrc rename to dotfiles/.config/bspwm/bspwmrc diff --git a/.config/bspwm/sxhkdrc b/dotfiles/.config/bspwm/sxhkdrc similarity index 100% rename from .config/bspwm/sxhkdrc rename to dotfiles/.config/bspwm/sxhkdrc diff --git a/.config/compton.conf b/dotfiles/.config/compton.conf similarity index 100% rename from .config/compton.conf rename to dotfiles/.config/compton.conf diff --git a/.config/dunst/dunstrc b/dotfiles/.config/dunst/dunstrc similarity index 100% rename from .config/dunst/dunstrc rename to dotfiles/.config/dunst/dunstrc diff --git a/.config/i3/config b/dotfiles/.config/i3/config similarity index 100% rename from .config/i3/config rename to dotfiles/.config/i3/config diff --git a/.config/i3status/i3status.conf.desktop b/dotfiles/.config/i3status/i3status.conf.desktop similarity index 100% rename from .config/i3status/i3status.conf.desktop rename to dotfiles/.config/i3status/i3status.conf.desktop diff --git a/.config/i3status/i3status.conf.laptop b/dotfiles/.config/i3status/i3status.conf.laptop similarity index 100% rename from .config/i3status/i3status.conf.laptop rename to dotfiles/.config/i3status/i3status.conf.laptop diff --git a/.config/nvim/.vimrc b/dotfiles/.config/nvim/.vimrc similarity index 100% rename from .config/nvim/.vimrc rename to dotfiles/.config/nvim/.vimrc diff --git a/.config/nvim/coc-settings.json b/dotfiles/.config/nvim/coc-settings.json similarity index 100% rename from .config/nvim/coc-settings.json rename to dotfiles/.config/nvim/coc-settings.json diff --git a/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim similarity index 100% rename from .config/nvim/init.vim rename to dotfiles/.config/nvim/init.vim diff --git a/.config/polybar/config.ini b/dotfiles/.config/polybar/config.ini similarity index 100% rename from .config/polybar/config.ini rename to dotfiles/.config/polybar/config.ini diff --git a/.config/rofi/config.rasi b/dotfiles/.config/rofi/config.rasi similarity index 100% rename from .config/rofi/config.rasi rename to dotfiles/.config/rofi/config.rasi diff --git a/.emacs b/dotfiles/.emacs similarity index 100% rename from .emacs rename to dotfiles/.emacs diff --git a/.emacs.d/config.org b/dotfiles/.emacs.d/config.org similarity index 100% rename from .emacs.d/config.org rename to dotfiles/.emacs.d/config.org diff --git a/.emacs.d/email.org b/dotfiles/.emacs.d/email.org similarity index 100% rename from .emacs.d/email.org rename to dotfiles/.emacs.d/email.org diff --git a/.emacs.d/exwm.org b/dotfiles/.emacs.d/exwm.org similarity index 100% rename from .emacs.d/exwm.org rename to dotfiles/.emacs.d/exwm.org diff --git a/.emacs.d/functions.org b/dotfiles/.emacs.d/functions.org similarity index 100% rename from .emacs.d/functions.org rename to dotfiles/.emacs.d/functions.org diff --git a/.emacs.d/lsp.org b/dotfiles/.emacs.d/lsp.org similarity index 100% rename from .emacs.d/lsp.org rename to dotfiles/.emacs.d/lsp.org diff --git a/.emacs.d/org.org b/dotfiles/.emacs.d/org.org similarity index 100% rename from .emacs.d/org.org rename to dotfiles/.emacs.d/org.org diff --git a/.emacs.d/start-exwm.sh b/dotfiles/.emacs.d/start-exwm.sh similarity index 100% rename from .emacs.d/start-exwm.sh rename to dotfiles/.emacs.d/start-exwm.sh diff --git a/.emacs.d/terminal.org b/dotfiles/.emacs.d/terminal.org similarity index 100% rename from .emacs.d/terminal.org rename to dotfiles/.emacs.d/terminal.org diff --git a/.gnupg/gpg-agent.conf b/dotfiles/.gnupg/gpg-agent.conf similarity index 100% rename from .gnupg/gpg-agent.conf rename to dotfiles/.gnupg/gpg-agent.conf diff --git a/.local/share/applications/exwm.desktop b/dotfiles/.local/share/applications/exwm.desktop similarity index 100% rename from .local/share/applications/exwm.desktop rename to dotfiles/.local/share/applications/exwm.desktop diff --git a/.local/share/fonts/FiraCode-Bold.ttf b/dotfiles/.local/share/fonts/FiraCode-Bold.ttf similarity index 100% rename from .local/share/fonts/FiraCode-Bold.ttf rename to dotfiles/.local/share/fonts/FiraCode-Bold.ttf diff --git a/.local/share/fonts/FiraCode-Light.ttf b/dotfiles/.local/share/fonts/FiraCode-Light.ttf similarity index 100% rename from .local/share/fonts/FiraCode-Light.ttf rename to dotfiles/.local/share/fonts/FiraCode-Light.ttf diff --git a/.local/share/fonts/FiraCode-Medium.ttf b/dotfiles/.local/share/fonts/FiraCode-Medium.ttf similarity index 100% rename from .local/share/fonts/FiraCode-Medium.ttf rename to dotfiles/.local/share/fonts/FiraCode-Medium.ttf diff --git a/.local/share/fonts/FiraCode-Regular.ttf b/dotfiles/.local/share/fonts/FiraCode-Regular.ttf similarity index 100% rename from .local/share/fonts/FiraCode-Regular.ttf rename to dotfiles/.local/share/fonts/FiraCode-Regular.ttf diff --git a/.local/share/fonts/FiraCode-Retina.ttf b/dotfiles/.local/share/fonts/FiraCode-Retina.ttf similarity index 100% rename from .local/share/fonts/FiraCode-Retina.ttf rename to dotfiles/.local/share/fonts/FiraCode-Retina.ttf diff --git a/.local/share/fonts/FiraCode-SemiBold.ttf b/dotfiles/.local/share/fonts/FiraCode-SemiBold.ttf similarity index 100% rename from .local/share/fonts/FiraCode-SemiBold.ttf rename to dotfiles/.local/share/fonts/FiraCode-SemiBold.ttf diff --git a/.local/share/fonts/MesloLGS NF Bold Italic.ttf b/dotfiles/.local/share/fonts/MesloLGS NF Bold Italic.ttf similarity index 100% rename from .local/share/fonts/MesloLGS NF Bold Italic.ttf rename to dotfiles/.local/share/fonts/MesloLGS NF Bold Italic.ttf diff --git a/.local/share/fonts/MesloLGS NF Bold.ttf b/dotfiles/.local/share/fonts/MesloLGS NF Bold.ttf similarity index 100% rename from .local/share/fonts/MesloLGS NF Bold.ttf rename to dotfiles/.local/share/fonts/MesloLGS NF Bold.ttf diff --git a/.local/share/fonts/MesloLGS NF Italic.ttf b/dotfiles/.local/share/fonts/MesloLGS NF Italic.ttf similarity index 100% rename from .local/share/fonts/MesloLGS NF Italic.ttf rename to dotfiles/.local/share/fonts/MesloLGS NF Italic.ttf diff --git a/.local/share/fonts/MesloLGS NF Regular.ttf b/dotfiles/.local/share/fonts/MesloLGS NF Regular.ttf similarity index 100% rename from .local/share/fonts/MesloLGS NF Regular.ttf rename to dotfiles/.local/share/fonts/MesloLGS NF Regular.ttf diff --git a/.mbsyncrc b/dotfiles/.mbsyncrc similarity index 100% rename from .mbsyncrc rename to dotfiles/.mbsyncrc diff --git a/.p10k.zsh b/dotfiles/.p10k.zsh similarity index 100% rename from .p10k.zsh rename to dotfiles/.p10k.zsh diff --git a/.screenlayout/launch.sh b/dotfiles/.screenlayout/launch.sh similarity index 100% rename from .screenlayout/launch.sh rename to dotfiles/.screenlayout/launch.sh diff --git a/.screenlayout/wallpapers.sh b/dotfiles/.screenlayout/wallpapers.sh similarity index 100% rename from .screenlayout/wallpapers.sh rename to dotfiles/.screenlayout/wallpapers.sh diff --git a/.scripts/autostart_desktop.sh b/dotfiles/.scripts/autostart_desktop.sh similarity index 100% rename from .scripts/autostart_desktop.sh rename to dotfiles/.scripts/autostart_desktop.sh diff --git a/.scripts/brightness.sh b/dotfiles/.scripts/brightness.sh similarity index 100% rename from .scripts/brightness.sh rename to dotfiles/.scripts/brightness.sh diff --git a/.stow-local-ignore b/dotfiles/.stow-local-ignore similarity index 100% rename from .stow-local-ignore rename to dotfiles/.stow-local-ignore diff --git a/.tmux.conf b/dotfiles/.tmux.conf similarity index 100% rename from .tmux.conf rename to dotfiles/.tmux.conf diff --git a/.xinitrc b/dotfiles/.xinitrc similarity index 100% rename from .xinitrc rename to dotfiles/.xinitrc diff --git a/.zshrc b/dotfiles/.zshrc similarity index 100% rename from .zshrc rename to dotfiles/.zshrc diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..13a5a58 --- /dev/null +++ b/flake.lock @@ -0,0 +1,49 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715381426, + "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.11", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1715668745, + "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..66ec03c --- /dev/null +++ b/flake.nix @@ -0,0 +1,27 @@ +{ + description = "Configuration flake for RandomCTF"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + home-manager = { + url = "github:nix-community/home-manager/release-23.11"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = { self, nixpkgs, home-manager, ... } @ inputs: + let + system = "x86_64-linux"; + in { + nixosConfigurations.randomctf = nixpkgs.lib.nixosSystem { + inherit system; + specialArgs = { inherit inputs; }; + modules = [ ./nixos/configuration.nix ]; + }; + + homeConfigurations.random = home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.${system}; + modules = [ ./home-manager/home.nix ]; + }; + }; +}