From 522ff8ac5d8fc1b7ad46e33a2157a4d2704946d4 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Tue, 2 May 2023 23:16:23 +0200
Subject: [PATCH] finished up most of the conversion work

---
 dotfiles/init.vim      |  43 -----
 dotfiles/locale.conf   |  10 --
 dotfiles/nanorc        | 305 -----------------------------------
 dotfiles/pipewire.conf | 355 -----------------------------------------
 dotfiles/zshrc         |  82 ----------
 home.nix               |   6 +-
 programs/alacritty.nix |  92 +++++------
 programs/beets.nix     |  40 +++--
 programs/direnv.nix    |   6 +-
 programs/git.nix       |  44 ++---
 programs/htop.nix      |  80 +++++-----
 programs/neovim.nix    |  56 +++----
 programs/starship.nix  |  12 +-
 programs/topgrade.nix  |  20 +--
 programs/vscode.nix    |   4 +-
 programs/yt-dlp.nix    |   5 +-
 programs/zsh.nix       |  84 +++++-----
 17 files changed, 229 insertions(+), 1015 deletions(-)
 delete mode 100644 dotfiles/init.vim
 delete mode 100644 dotfiles/locale.conf
 delete mode 100644 dotfiles/nanorc
 delete mode 100644 dotfiles/pipewire.conf
 delete mode 100644 dotfiles/zshrc

diff --git a/dotfiles/init.vim b/dotfiles/init.vim
deleted file mode 100644
index a3223c7..0000000
--- a/dotfiles/init.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-call plug#begin('~/.vim/plugged')
-
-" FILE VIEW
-Plug 'scrooloose/nerdtree'
-Plug 'ryanoasis/vim-devicons'
-
-" COC
-Plug 'neoclide/coc.nvim', {'branch': 'release'}
-Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
-
-Plug 'dense-analysis/ale'
-
-call plug#end()
-
-" GENERAL
-
-set title
-set number
-set relativenumber
-set cursorline
-
-"
-
-set mouse=a
-
-" THEMES
-syntax enable
-
-" FILE VIEW
-
-let g:NERDTreeShowHidden = 1
-let g:NERDTreeMinimalUI = 1
-let g:NERDTreeIgnore = [ '.git/' ]
-let g:NERDTreeStatusline = ''
-let g:NERDTreeMouseMode = 2
-" Automaticaly close nvim if NERDTree is only thing left open
-autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
-" Toggle
-nnoremap <silent> <C-b> :NERDTreeToggle<CR>
-
-" COC
-let g:coc_global_extensions = ['coc-emmet', 'coc-css', 'coc-html', 'coc-json', 'coc-prettier', 'coc-tsserver']
-
diff --git a/dotfiles/locale.conf b/dotfiles/locale.conf
deleted file mode 100644
index 671b6a7..0000000
--- a/dotfiles/locale.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-LANG=de_DE.UTF-8
-LC_ADDRESS=de_DE.UTF-8
-LC_IDENTIFICATION=de_DE.UTF-8
-LC_MEASUREMENT=de_DE.UTF-8
-LC_MONETARY=de_DE.UTF-8
-LC_NAME=de_DE.UTF-8
-LC_NUMERIC=de_DE.UTF-8
-LC_PAPER=de_DE.UTF-8
-LC_TELEPHONE=de_DE.UTF-8
-LC_TIME=de_DE.UTF-8
\ No newline at end of file
diff --git a/dotfiles/nanorc b/dotfiles/nanorc
deleted file mode 100644
index 0fce9c8..0000000
--- a/dotfiles/nanorc
+++ /dev/null
@@ -1,305 +0,0 @@
-## Test comment
-
-## Sample initialization file for GNU nano.
-##
-## For the options that take parameters, the default value is shown.
-## Other options are unset by default.  To make sure that an option
-## is disabled, you can use "unset <option>".
-##
-## Characters that are special in a shell should not be escaped here.
-## Inside string parameters, quotes should not be escaped -- the last
-## double quote on the line will be seen as the closing quote.
-
-## Make 'nextword' (Ctrl+Right) and 'chopwordright' (Ctrl+Delete)
-## stop at word ends instead of at beginnings.
-# set afterends
-
-## When soft line wrapping is enabled, make it wrap lines at blanks
-## (tabs and spaces) instead of always at the edge of the screen.
-# set atblanks
-
-## Automatically indent a newly created line to the same number of
-## tabs and/or spaces as the preceding line -- or as the next line
-## if the preceding line is the beginning of a paragraph.
-# set autoindent
-
-## Back up files to the current filename plus a tilde.
-# set backup
-
-## The directory to put unique backup files in.
-# set backupdir ""
-
-## Use bold text instead of reverse video text.
-# set boldtext
-
-## Treat any line with leading whitespace as the beginning of a paragraph.
-# set bookstyle
-
-## The characters treated as closing brackets when justifying paragraphs.
-## This may not include any blank characters.  Only closing punctuation,
-## optionally followed by these closing brackets, can end sentences.
-# set brackets ""')>]}"
-
-## Automatically hard-wrap the current line when it becomes overlong.
-# set breaklonglines
-
-## Do case-sensitive searches by default.
-# set casesensitive
-
-## Constantly display the cursor position in the status bar.  Note that
-## this overrides "quickblank".
-# set constantshow
-
-## Use cut-from-cursor-to-end-of-line by default.
-# set cutfromcursor
-
-## Do not use the line below the title bar, leaving it entirely blank.
-# set emptyline
-
-## Set the target width for automatic hard-wrapping and for justifying
-## paragraphs.  If the specified value is 0 or less, the wrapping point
-## will be the terminal's width minus this number.
-# set fill -8
-
-## Remember the used search/replace strings for the next session.
-# set historylog
-
-## Display a "scrollbar" on the righthand side of the edit window.
-# set indicator
-
-## Scroll the buffer contents per half-screen instead of per line.
-# set jumpyscrolling
-
-## Display line numbers to the left (and any anchors in the margin).
-set linenumbers
-
-## Enable vim-style lock-files.  This is just to let a vim user know you
-## are editing a file [s]he is trying to edit and vice versa.  There are
-## no plans to implement vim-style undo state in these files.
-# set locking
-
-## Fall back to slow libmagic to try and determine an applicable syntax.
-# set magic
-
-# After a search, set the mark at the end of the found match (if any).
-# set markmatch
-
-## The opening and closing brackets that can be found by bracket
-## searches.  They cannot contain blank characters.  The former set must
-## come before the latter set, and both must be in the same order.
-# set matchbrackets "(<[{)>]}"
-
-## Suppress title bar and show file name and editor state at the bottom.
-# set minibar
-
-## Enable mouse support, if available for your system.  When enabled,
-## mouse clicks can be used to place the cursor, set the mark (with a
-## double click), and execute shortcuts.  The mouse will work in the X
-## Window System, and on the console when gpm is running.
-# set mouse
-
-## Switch on multiple file buffers (inserting a file will put it into
-## a separate buffer).
-# set multibuffer
-
-## Don't convert files from DOS/Mac format.
-# set noconvert
-
-## Don't display the helpful shortcut lists at the bottom of the screen.
-# set nohelp
-
-## Don't automatically add a newline when a file does not end with one.
-# set nonewlines
-
-## Set operating directory.  nano will not read or write files outside
-## this directory and its subdirectories.  Also, the current directory
-## is changed to here, so any files are inserted from this dir.  A blank
-## string means the operating-directory feature is turned off.
-# set operatingdir ""
-
-## Remember the cursor position in each file for the next editing session.
-# set positionlog
-
-## Preserve the XON and XOFF keys (^Q and ^S).
-# set preserve
-
-## The characters treated as closing punctuation when justifying
-## paragraphs.  They cannot contain blank characters.  Only closing
-## punctuation, optionally followed by closing brackets, can end
-## sentences.
-# set punct "!.?"
-
-## Do quick status-bar blanking.  Status-bar messages will disappear after
-## 1 keystroke instead of 26.  Note that "constantshow" overrides this.
-# set quickblank
-
-## The regular expression that matches quoting characters in email
-## or line-comment introducers in source code.  The default is:
-# set quotestr "^([ 	]*([!#%:;>|}]|//))+"
-
-## Try to work around a mismatching terminfo terminal description.
-# set rawsequences
-
-## Fix Backspace/Delete confusion problem.
-# set rebinddelete
-
-## Do regular-expression searches by default.
-## Regular expressions are of the extended type (ERE).
-# set regexp
-
-## Save a changed buffer automatically on exit; don't prompt.
-# set saveonexit
-## (The old form of this option, 'set tempfile', is deprecated.)
-
-## Put the cursor on the highlighted item in the file browser, and show
-## the cursor in the help viewer; useful for people who use a braille
-## display and people with poor vision.
-# set showcursor
-
-## Make the Home key smarter.  When Home is pressed anywhere but at the
-## very beginning of non-whitespace characters on a line, the cursor
-## will jump to that beginning (either forwards or backwards).  If the
-## cursor is already at that position, it will jump to the true
-## beginning of the line.
-# set smarthome
-
-## Spread overlong lines over multiple screen lines.
-# set softwrap
-
-## Use this spelling checker instead of the internal one.  This option
-## does not have a default value.
-# set speller "aspell -x -c"
-
-## Use the end of the title bar for some state flags: I = auto-indenting,
-## M = mark, L = hard-wrapping long lines, R = recording, S = soft-wrapping.
-# set stateflags
-
-## Allow nano to be suspended (with ^Z by default).
-# set suspendable
-## (The old form of this option, 'set suspend', is deprecated.)
-
-## Use this tab size instead of the default; it must be greater than 0.
-# set tabsize 8
-
-## Convert typed tabs to spaces.
-# set tabstospaces
-
-## Snip whitespace at the end of lines when justifying or hard-wrapping.
-# set trimblanks
-
-## The two single-column characters used to display the first characters
-## of tabs and spaces.  187 in ISO 8859-1 (0000BB in Unicode) and 183 in
-## ISO-8859-1 (0000B7 in Unicode) seem to be good values for these.
-## The default when in a UTF-8 locale:
-# set whitespace "»·"
-## The default otherwise:
-# set whitespace ">."
-
-## Detect word boundaries differently by treating punctuation
-## characters as parts of words.
-# set wordbounds
-
-## The characters (besides alphanumeric ones) that should be considered
-## as parts of words.  This option does not have a default value.  When
-## set, it overrides option 'set wordbounds'.
-# set wordchars "<_>."
-
-## Let an unmodified Backspace or Delete erase the marked region (instead
-## of a single character, and without affecting the cutbuffer).
-# set zap
-
-## Paint the interface elements of nano.  These are examples;
-## by default there are no colors, except for errorcolor.
-# set titlecolor bold,lightwhite,blue
-# set promptcolor lightwhite,lightblack
-# set statuscolor bold,lightwhite,green
-# set errorcolor bold,lightwhite,red
-# set selectedcolor lightwhite,magenta
-# set stripecolor ,yellow
-# set scrollercolor cyan
-# set numbercolor cyan
-# set keycolor cyan
-# set functioncolor green
-
-## In root's .nanorc you might want to use:
-# set titlecolor bold,lightwhite,magenta
-# set promptcolor black,yellow
-# set statuscolor bold,lightwhite,magenta
-# set errorcolor bold,lightwhite,red
-# set selectedcolor lightwhite,cyan
-# set stripecolor ,yellow
-# set scrollercolor magenta
-# set numbercolor magenta
-# set keycolor lightmagenta
-# set functioncolor magenta
-
-
-## === Syntax coloring ===
-## For all details, see 'man nanorc', section SYNTAX HIGHLIGHTING.
-
-## To include most of the existing syntax definitions, you can do:
-include "/usr/share/nano/*.nanorc"
-
-## Or you can select just the ones you need.  For example:
-# include "/usr/share/nano/html.nanorc"
-# include "/usr/share/nano/python.nanorc"
-# include "/usr/share/nano/sh.nanorc"
-
-## In /usr/share/nano/extra/ you can find some syntaxes that are
-## specific for certain distros or for some less common languages.
-
-
-## If <Tab> should always produce four spaces when editing a Python file,
-## independent of the settings of 'tabsize' and 'tabstospaces':
-# extendsyntax python tabgives "    "
-
-## If <Tab> should always produce an actual TAB when editing a Makefile:
-# extendsyntax makefile tabgives "	"
-
-
-## === Key bindings ===
-## For all details, see 'man nanorc', section REBINDING KEYS.
-
-## The <Ctrl+Delete> keystroke deletes the word to the right of the cursor.
-## On some terminals the <Ctrl+Backspace> keystroke produces ^H, which is
-## the ASCII character for backspace, so it is bound by default to the
-## backspace function.  The <Backspace> key itself produces a different
-## keycode, which is hard-bound to the backspace function.  So, if you
-## normally use <Backspace> for backspacing and not ^H, you can make
-## <Ctrl+Backspace> delete the word to the left of the cursor with:
-# bind ^H chopwordleft main
-
-## If you would like nano to have keybindings that are more "usual",
-## such as ^O for Open, ^F for Find, ^H for Help, and ^Q for Quit,
-## then uncomment these:
-#bind ^Q exit all
-#bind ^S savefile main
-#bind ^W writeout main
-#bind ^O insert main
-#bind ^H help all
-#bind ^H exit help
-#bind ^F whereis all
-#bind ^G findnext all
-#bind ^B wherewas all
-#bind ^D findprevious all
-#bind ^R replace main
-#bind M-X flipnewbuffer all
-#bind ^X cut all
-#bind ^C copy main
-#bind ^V paste all
-#bind ^P location main
-#bind ^A mark main
-#unbind ^K main
-#unbind ^U all
-#unbind ^N main
-#unbind ^Y all
-#unbind M-J main
-#unbind M-T main
-#bind ^T gotoline main
-#bind ^T gotodir browser
-#bind ^Y speller main
-#bind M-U undo main
-#bind M-R redo main
-#bind ^U undo main
-#bind ^E redo main
-#set multibuffer
diff --git a/dotfiles/pipewire.conf b/dotfiles/pipewire.conf
deleted file mode 100644
index b4936dd..0000000
--- a/dotfiles/pipewire.conf
+++ /dev/null
@@ -1,355 +0,0 @@
-# Daemon config file for PipeWire version "0.3.42" #
-#
-# Copy and edit this file in /etc/pipewire for system-wide changes
-# or in ~/.config/pipewire for local changes.
-
-context.properties = {
-    ## Configure properties in the system.
-    #library.name.system                   = support/libspa-support
-    #context.data-loop.library.name.system = support/libspa-support
-    #support.dbus                          = true
-    #link.max-buffers                      = 64
-    link.max-buffers                       = 16                       # version < 3 clients can't handle more
-    #mem.warn-mlock                        = false
-    #mem.allow-mlock                       = true
-    #mem.mlock-all                         = false
-    #clock.power-of-two-quantum            = true
-    #log.level                             = 2
-    #cpu.zero.denormals                    = true
-
-    core.daemon = true              # listening for socket connections
-    core.name   = pipewire-0        # core name and socket name
-
-    ## Properties for the DSP configuration.
-    #default.clock.rate          = 48000
-    #default.clock.allowed-rates = [ 48000 ]
-    #default.clock.quantum       = 1024
-    #default.clock.min-quantum   = 32
-    #defau lt.clock.max-quantum   = 8192
-    #default.video.width         = 640
-    #default.video.height        = 480
-    #default.video.rate.num      = 25
-    #default.video.rate.denom    = 1
-    #
-    # These overrides are only applied when running in a vm.
-    vm.overrides = {
-        default.clock.min-quantum = 1024
-    }
-}
-
-context.spa-libs = {
-    #<factory-name regex> = <library-name>
-    #
-    # Used to find spa factory names. It maps an spa factory name
-    # regular expression to a library name that should contain
-    # that factory.
-    #
-    audio.convert.* = audioconvert/libspa-audioconvert
-    api.alsa.*      = alsa/libspa-alsa
-    api.v4l2.*      = v4l2/libspa-v4l2
-    api.libcamera.* = libcamera/libspa-libcamera
-    api.bluez5.*    = bluez5/libspa-bluez5
-    api.vulkan.*    = vulkan/libspa-vulkan
-    api.jack.*      = jack/libspa-jack
-    support.*       = support/libspa-support
-    #videotestsrc   = videotestsrc/libspa-videotestsrc
-    #audiotestsrc   = audiotestsrc/libspa-audiotestsrc
-}
-
-context.modules = [
-    #{ name = <module-name>
-    #    [ args  = { <key> = <value> ... } ]
-    #    [ flags = [ [ ifexists ] [ nofail ] ]
-    #}
-    #
-    # Loads a module with the given parameters.
-    # If ifexists is given, the module is ignored when it is not found.
-    # If nofail is given, module initialization failures are ignored.
-    #
-
-    # Uses RTKit to boost the data thread priority.
-    { name = libpipewire-module-rtkit
-        args = {
-            #nice.level   = -11
-            #rt.prio      = 88
-            #rt.time.soft = 2000000
-            #rt.time.hard = 2000000
-        }
-        flags = [ ifexists nofail ]
-    }
-
-    # Set thread priorities without using RTKit.
-    #{ name = libpipewire-module-rt
-    #    args = {
-    #        nice.level   = -11
-    #        rt.prio      = 88
-    #        rt.time.soft = 2000000
-    #        rt.time.hard = 2000000
-    #    }
-    #    flags = [ ifexists nofail ]
-    #}
-
-    # The native communication protocol.
-    { name = libpipewire-module-protocol-native }
-
-    # The profile module. Allows application to access profiler
-    # and performance data. It provides an interface that is used
-    # by pw-top and pw-profiler.
-    { name = libpipewire-module-profiler }
-
-    # Allows applications to create metadata objects. It creates
-    # a factory for Metadata objects.
-    { name = libpipewire-module-metadata }
-
-    # Creates a factory for making devices that run in the
-    # context of the PipeWire server.
-    { name = libpipewire-module-spa-device-factory }
-
-    # Creates a factory for making nodes that run in the
-    # context of the PipeWire server.
-    { name = libpipewire-module-spa-node-factory }
-
-    # Allows creating nodes that run in the context of the
-    # client. Is used by all clients that want to provide
-    # data to PipeWire.
-    { name = libpipewire-module-client-node }
-
-    # Allows creating devices that run in the context of the
-    # client. Is used by the session manager.
-    { name = libpipewire-module-client-device }
-
-    # The portal module monitors the PID of the portal process
-    # and tags connections with the same PID as portal
-    # connections.
-    { name = libpipewire-module-portal
-        flags = [ ifexists nofail ]
-    }
-
-    # The access module can perform access checks and block
-    # new clients.
-    { name = libpipewire-module-access
-        args = {
-            # access.allowed to list an array of paths of allowed
-            # apps.
-            #access.allowed = [
-            #    /usr/bin/pipewire-media-session
-            #]
-
-            # An array of rejected paths.
-            #access.rejected = [ ]
-
-            # An array of paths with restricted access.
-            #access.restricted = [ ]
-
-            # Anything not in the above lists gets assigned the
-            # access.force permission.
-            #access.force = flatpak
-        }
-    }
-
-    # Makes a factory for wrapping nodes in an adapter with a
-    # converter and resampler.
-    { name = libpipewire-module-adapter }
-
-    # Makes a factory for creating links between ports.
-    { name = libpipewire-module-link-factory }
-
-    # Provides factories to make session manager objects.
-    { name = libpipewire-module-session-manager }
-
-    {   
-        name = libpipewire-module-loopback
-            args = {
-                node.name = "OBS"
-                node.description = "OBS"
-                capture.props = {
-                    media.class = "Audio/Sink"
-                    audio.position = [ FL FR ]
-                }
-                playback.props = {
-                    audio.position = [ FL FR ]
-                    node.target = "alsa_output.usb-MOTU_M4_M4AE167AEJ-00.analog-surround-40"
-                    stream.dont-remix = true
-                    node.passive = true
-                }
-            }
-    }
-
-    {   
-        name = libpipewire-module-loopback
-            args = {
-                node.name = "M4 Stereo (1&2) -- Monitor & Headphones"
-                node.description = "M4 Stereo (1&2) -- Monitor & Headphones"
-                capture.props = {
-                    media.class = "Audio/Sink"
-                    audio.position = [ FL FR ]
-                }
-                playback.props = {
-                    audio.position = [ FL FR ]
-                    node.target = "alsa_output.usb-MOTU_M4_M4AE167AEJ-00.analog-surround-40"
-                    stream.dont-remix = true
-                    node.passive = true
-                }
-            }
-    }
-
-    {
-        name = libpipewire-module-loopback
-            args = {
-                node.name = "M4 Stereo (3&4) -- Line Out"
-                node.description = "M4 Stereo (3&4) -- Line Out"
-                capture.props = {
-                    media.class = "Audio/Sink"
-                    audio.position = [ FL FR ]
-                }
-                playback.props = {
-                    audio.position = [ RR RL ]
-                    node.target = "alsa_output.usb-MOTU_M4_M4AE167AEJ-00.analog-surround-40"
-                    stream.dont-remix = true
-                    node.passive = true
-                }
-            }
-    }
-
-    {   
-        name = libpipewire-module-loopback
-        args = {
-            node.name = "M4 Input 1"
-            node.description = "M4 Input 1"
-            capture.props = {
-                audio.position = [ FL ]
-                stream.dont-remix = true
-                node.target = "alsa_input.usb-MOTU_M4_M4AE167AEJ-00.analog-surround-40"
-                node.passive = true
-            }
-            playback.props = {
-                media.class = "Audio/Source"
-                audio.position = [ MONO ]
-            }
-        }
-    }
-
-    {   
-        name = libpipewire-module-loopback
-        args = {
-            node.name = "M4 Input 2"
-            node.description = "M4 Input 2"
-            capture.props = {
-                audio.position = [ FR ]
-                stream.dont-remix = true
-                node.target = "alsa_input.usb-MOTU_M4_M4AE167AEJ-00.analog-surround-40"
-                node.passive = true
-            }
-            playback.props = {
-                media.class = "Audio/Source"
-                audio.position = [ MONO ]
-            }
-        }
-    }
-
-    {   
-        name = libpipewire-module-loopback
-        args = {
-            node.name = "M4 Input (3&4) -- Line In"
-            node.description = "M4 Input (3&4) -- Line In"
-            capture.props = {
-                audio.position = [ RL RR ]
-                stream.dont-remix = true
-                node.target = "alsa_input.usb-MOTU_M4_M4AE167AEJ-00.analog-surround-40"
-                node.passive = true
-            }
-            playback.props = {
-                media.class = "Audio/Source"
-                audio.position = [ FL FR ]
-            }
-        }
-    }
-]
-
-context.objects = [
-    #{ factory = <factory-name>
-    #    [ args  = { <key> = <value> ... } ]
-    #    [ flags = [ [ nofail ] ]
-    #}
-    #
-    # Creates an object from a PipeWire factory with the given parameters.
-    # If nofail is given, errors are ignored (and no object is created).
-    #
-    #{ factory = spa-node-factory   args = { factory.name = videotestsrc node.name = videotestsrc Spa:Pod:Object:Param:Props:patternType = 1 } }
-    #{ factory = spa-device-factory args = { factory.name = api.jack.device foo=bar } flags = [ nofail ] }
-    #{ factory = spa-device-factory args = { factory.name = api.alsa.enum.udev } }
-    #{ factory = spa-node-factory   args = { factory.name = api.alsa.seq.bridge node.name = Internal-MIDI-Bridge } }
-    #{ factory = adapter            args = { factory.name = audiotestsrc node.name = my-test } }
-    #{ factory = spa-node-factory   args = { factory.name = api.vulkan.compute.source node.name = my-compute-source } }
-
-    # A default dummy driver. This handles nodes marked with the "node.always-driver"
-    # property when no other driver is currently active. JACK clients need this.
-    { factory = spa-node-factory
-        args = {
-            factory.name    = support.node.driver
-            node.name       = Dummy-Driver
-            node.group      = pipewire.dummy
-            priority.driver = 20000
-        }
-    }
-    { factory = spa-node-factory
-        args = {
-            factory.name    = support.node.driver
-            node.name       = Freewheel-Driver
-            priority.driver = 19000
-            node.group      = pipewire.freewheel
-            node.freewheel  = true
-        }
-    }
-    # This creates a new Source node. It will have input ports
-    # that you can link, to provide audio for this source.
-    #{ factory = adapter
-    #    args = {
-    #        factory.name     = support.null-audio-sink
-    #        node.name        = "my-mic"
-    #        node.description = "Microphone"
-    #        media.class      = "Audio/Source/Virtual"
-    #        audio.position   = "FL,FR"
-    #    }
-    #}
-
-    # This creates a single PCM source device for the given
-    # alsa device path hw:0. You can change source to sink
-    # to make a sink in the same way.
-    #{ factory = adapter
-    #    args = {
-    #        factory.name           = api.alsa.pcm.source
-    #        node.name              = "alsa-source"
-    #        node.description       = "PCM Source"
-    #        media.class            = "Audio/Source"
-    #        api.alsa.path          = "hw:0"
-    #        api.alsa.period-size   = 1024
-    #        api.alsa.headroom      = 0
-    #        api.alsa.disable-mmap  = false
-    #        api.alsa.disable-batch = false
-    #        audio.format           = "S16LE"
-    #        audio.rate             = 48000
-    #        audio.channels         = 2
-    #        audio.position         = "FL,FR"
-    #    }
-    #}
-]
-
-context.exec = [
-    #{ path = <program-name> [ args = "<arguments>" ] }
-    #
-    # Execute the given program with arguments.
-    #
-    # You can optionally start the session manager here,
-    # but it is better to start it as a systemd service.
-    # Run the session manager with -h for options.
-    #
-    #{ path = "/usr/bin/pipewire-media-session" args = "" }
-    #
-    # You can optionally start the pulseaudio-server here as well
-    # but it is better to start it as a systemd service.
-    # It can be interesting to start another daemon here that listens
-    # on another address with the -a option (eg. -a tcp:4713).
-    #
-    #{ path = "/usr/bin/pipewire" args = "-c pipewire-pulse.conf" }
-]
\ No newline at end of file
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
deleted file mode 100644
index df6dc30..0000000
--- a/dotfiles/zshrc
+++ /dev/null
@@ -1,82 +0,0 @@
-export PATH=$HOME/bin:$HOME/.local/bin:$HOME/.flutter/bin:$PATH
-export TERM="xterm-256color"
-export LANG=en_US.UTF-8
-
-if [[ -n $SSH_CONNECTION ]]; then
-  export EDITOR='vim'
-else
-  export EDITOR='nvim'
-fi
-
-source $HOME/.aliases
-
-### Added by Zinit's installer
-if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then
-    print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f"
-    command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit"
-    command git clone https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \
-        print -P "%F{33} %F{34}Installation successful.%f%b" || \
-        print -P "%F{160} The clone has failed.%f%b"
-fi
-
-source "$HOME/.local/share/zinit/zinit.git/zinit.zsh"
-autoload -Uz _zinit
-(( ${+_comps} )) && _comps[zinit]=_zinit
-
-# Load a few important annexes, without Turbo
-# (this is currently required for annexes)
-zinit light-mode for \
-    zdharma-continuum/zinit-annex-as-monitor \
-    zdharma-continuum/zinit-annex-bin-gem-node \
-    zdharma-continuum/zinit-annex-patch-dl \
-    zdharma-continuum/zinit-annex-rust
-
-### End of Zinit's installer chunk
-
-zinit snippet OMZP::asdf
-zinit snippet OMZP::git
-# zinit snippet OMZP::asdf
-zinit snippet OMZP::archlinux
-zinit snippet OMZP::brew
-zinit snippet OMZP::composer
-zinit snippet OMZP::colored-man-pages
-zinit snippet OMZP::extract
-zinit snippet OMZP::gradle
-zinit snippet OMZP::node
-zinit snippet OMZP::npm
-zinit snippet OMZP::nvm
-zinit snippet OMZP::rbenv
-zinit snippet OMZP::sudo
-zinit snippet OMZP::direnv
-zinit snippet OMZP::docker
-zinit snippet OMZP::docker-compose
-zinit snippet OMZP::golang
-zinit snippet OMZP::pip
-zinit snippet OMZP::history
-zinit snippet OMZP::vagrant
-
-zinit light zsh-users/zsh-completions
-zinit light zsh-users/zsh-autosuggestions
-zinit light zsh-users/zsh-syntax-highlighting
-zinit light zkuzmic/which-jspm
-
-zinit ice as"command" from"gh-r" \
-          atclone"./starship init zsh > init.zsh; ./starship completions zsh > _starship" \
-          atpull"%atclone" src"init.zsh"
-zinit light starship/starship
-
-# eval "$(starship init zsh)"
-
-# pnpm
-export PNPM_HOME="/home/thilo/.local/share/pnpm"
-export PATH="$PNPM_HOME:$PATH"
-
-# bun completions
-[ -s "/home/thilo/.bun/_bun" ] && source "/home/thilo/.bun/_bun"
-
-# bun
-export BUN_INSTALL="$HOME/.bun"
-export PATH="$BUN_INSTALL/bin:$PATH"
-
-export DENO_INSTALL="/home/thilo/.deno"
-export PATH="$DENO_INSTALL/bin:$PATH"
diff --git a/home.nix b/home.nix
index 7137fff..bc2fdaa 100644
--- a/home.nix
+++ b/home.nix
@@ -58,8 +58,10 @@ in {
       '')
     ];
     file = {
-      ".config/nano/nanorc".source = ./dotfiles/nanorc;
-      ".config/locale.conf".source = ./dotfiles/locale.conf;
+      ".config/nano/nanorc".text = ''
+        set linenumbers
+        include "/usr/share/nano/*.nanorc"
+      '';
       ".ssh/config".source = ./dotfiles/ssh-config;
     };
     sessionVariables = {
diff --git a/programs/alacritty.nix b/programs/alacritty.nix
index c8e6e38..aef6da0 100644
--- a/programs/alacritty.nix
+++ b/programs/alacritty.nix
@@ -10,59 +10,61 @@ let
       mkdir $out/bin
       for bin in ${pkg}/bin/*; do
        wrapped_bin=$out/bin/$(basename $bin)
-       echo -e "#!/bin/bash\nexec ${lib.getExe nixgl.auto.nixGLDefault} $bin \$@" > $wrapped_bin
+       echo -e "#!/bin/bash\nexec ${
+         lib.getExe nixgl.auto.nixGLDefault
+       } $bin \$@" > $wrapped_bin
        chmod +x $wrapped_bin
       done
     '';
 in {
   programs.alacritty = {
-      enable = true;
-      package = (nixGLWrap pkgs.alacritty);
-      settings = {
-        window = {
-          decorations = "full";
-          dynamic_title = true;
-          gtk_theme_variant = "None";
+    enable = true;
+    package = (nixGLWrap pkgs.alacritty);
+    settings = {
+      window = {
+        decorations = "full";
+        dynamic_title = true;
+        gtk_theme_variant = "None";
+      };
+      window.opacity = 1;
+      font = {
+        normal = {
+          family = "JetbrainsMono NFM";
+          style = "Regular";
         };
-        window.opacity = 1;
-        font = {
-          normal = {
-            family = "JetbrainsMono NFM";
-            style = "Regular";
-          };
-          bold = {
-            family = "JetbrainsMono NFM";
-            style = "Bold";
-          };
-          size = 14;
+        bold = {
+          family = "JetbrainsMono NFM";
+          style = "Bold";
         };
-        cursor.style.shape = "Beam";
-        colors = {
-          primary = {
-            background = "0x282a36";
-            foreground = "0xeff0eb";
-          };
-          normal = {
-            black = "0x282a36";
-            red = "0xff5c57";
-            green = "0x5af78e";
-            yellow = "0xf3f99d";
-            blue = "0x57c7ff";
-            magenta = "0xff6ac1";
-            cyan = "0x9aedfe";
-            white = "0xf1f1f0";
-          };
-          bright = {
-            black = "0x686868";
-            red = "0xff5c57";
-            green = "0x5af78e";
-            yellow = "0xf3f99d";
-            blue = "0x57c7ff";
-            magenta = "0xff6ac1";
-            cyan = "0x9aedfe";
-            white = "0xf1f1f0";
-          };
+        size = 14;
+      };
+      cursor.style.shape = "Beam";
+      colors = {
+        primary = {
+          background = "0x282a36";
+          foreground = "0xeff0eb";
+        };
+        normal = {
+          black = "0x282a36";
+          red = "0xff5c57";
+          green = "0x5af78e";
+          yellow = "0xf3f99d";
+          blue = "0x57c7ff";
+          magenta = "0xff6ac1";
+          cyan = "0x9aedfe";
+          white = "0xf1f1f0";
+        };
+        bright = {
+          black = "0x686868";
+          red = "0xff5c57";
+          green = "0x5af78e";
+          yellow = "0xf3f99d";
+          blue = "0x57c7ff";
+          magenta = "0xff6ac1";
+          cyan = "0x9aedfe";
+          white = "0xf1f1f0";
         };
       };
     };
+  };
 }
diff --git a/programs/beets.nix b/programs/beets.nix
index 78f7463..6bfd422 100644
--- a/programs/beets.nix
+++ b/programs/beets.nix
@@ -2,28 +2,26 @@
 
 {
   programs.beets = {
-      enable = true;
-      settings = {
-        directory = "~/Music/dj/Library";
-        library = "~/Music/dj/library.db";
-        plugins = "spotify acousticbrainz badfiles duplicates fetchart";
-        import = {
-          write = "yes";
-          copy = "yes";
-          resume = "no";
-          duplicate_action = "ask";
-          default_action = "apply";
-        };
-        badfiles = {
-          check_on_import = "yes";
-        };
-        match = {
-          max_rec = {
-            track_length = "strong";
-            track_title = "strong";
-            track_artist = "strong";
-          };
+    enable = true;
+    settings = {
+      directory = "~/Music/dj/Library";
+      library = "~/Music/dj/library.db";
+      plugins = "spotify acousticbrainz badfiles duplicates fetchart";
+      import = {
+        write = "yes";
+        copy = "yes";
+        resume = "no";
+        duplicate_action = "ask";
+        default_action = "apply";
+      };
+      badfiles = { check_on_import = "yes"; };
+      match = {
+        max_rec = {
+          track_length = "strong";
+          track_title = "strong";
+          track_artist = "strong";
         };
       };
     };
+  };
 }
diff --git a/programs/direnv.nix b/programs/direnv.nix
index a7ed27b..4831772 100644
--- a/programs/direnv.nix
+++ b/programs/direnv.nix
@@ -2,7 +2,7 @@
 
 {
   programs.direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-    };
+    enable = true;
+    nix-direnv.enable = true;
+  };
 }
diff --git a/programs/git.nix b/programs/git.nix
index cea4205..f2e6d7c 100644
--- a/programs/git.nix
+++ b/programs/git.nix
@@ -2,28 +2,28 @@
 
 {
   programs.git = {
-      enable = true;
-      lfs.enable = true;
-      userEmail = "thilo.billerbeck@officerent.de";
-      userName = "Thilo Billerbeck";
-      extraConfig = {
-        color = {
-          diff = "auto";
-          status = "auto";
-          branch = "auto";
-          interactive = "auto";
-          ui = true;
-          pager = true;
-        };
-        log = { date = "short"; };
-        rerere = { enabled = "1"; };
-        core = {
-          whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol";
-          excludesfile = "~/.gitignore-rab";
-          autocrlf = "input";
-        };
-        apply = { whitespace = "nowarn"; };
-        branch = { autosetuprebase = "always"; };
+    enable = true;
+    lfs.enable = true;
+    userEmail = "thilo.billerbeck@officerent.de";
+    userName = "Thilo Billerbeck";
+    extraConfig = {
+      color = {
+        diff = "auto";
+        status = "auto";
+        branch = "auto";
+        interactive = "auto";
+        ui = true;
+        pager = true;
       };
+      log = { date = "short"; };
+      rerere = { enabled = "1"; };
+      core = {
+        whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol";
+        excludesfile = "~/.gitignore-rab";
+        autocrlf = "input";
+      };
+      apply = { whitespace = "nowarn"; };
+      branch = { autosetuprebase = "always"; };
     };
+  };
 }
diff --git a/programs/htop.nix b/programs/htop.nix
index a739289..fd171d8 100644
--- a/programs/htop.nix
+++ b/programs/htop.nix
@@ -2,45 +2,45 @@
 
 {
   programs.htop = {
-      enable = true;
-      settings = {
-        fields="0 48 17 18 38 39 40 2 46 47 49 1";
-        sort_key="46";
-        sort_direction="1";
-        tree_sort_key="0";
-        tree_sort_direction="1";
-        hide_kernel_threads="1";
-        hide_userland_threads="0";
-        shadow_other_users="0";
-        show_thread_names="0";
-        show_program_path="1";
-        highlight_base_name="0";
-        highlight_megabytes="1";
-        highlight_threads="1";
-        highlight_changes="0";
-        highlight_changes_delay_secs="5";
-        find_comm_in_cmdline="1";
-        strip_exe_from_cmdline="1";
-        show_merged_command="0";
-        tree_view="1";
-        tree_view_always_by_pid="0";
-        header_margin="1";
-        detailed_cpu_time="0";
-        cpu_count_from_one="0";
-        show_cpu_usage="1";
-        show_cpu_frequency="0";
-        show_cpu_temperature="0";
-        degree_fahrenheit="0";
-        update_process_names="0";
-        account_guest_in_cpu_meter="0";
-        color_scheme="0";
-        enable_mouse="1";
-        delay="15";
-        left_meters="LeftCPUs2 CPU Memory DiskIO NetworkIO";
-        left_meter_modes="1 1 1 2 2";
-        right_meters="RightCPUs2 Tasks LoadAverage Uptime Battery";
-        right_meter_modes="1 2 2 2 2";
-        hide_function_bar="0";
-      };
+    enable = true;
+    settings = {
+      fields = "0 48 17 18 38 39 40 2 46 47 49 1";
+      sort_key = "46";
+      sort_direction = "1";
+      tree_sort_key = "0";
+      tree_sort_direction = "1";
+      hide_kernel_threads = "1";
+      hide_userland_threads = "0";
+      shadow_other_users = "0";
+      show_thread_names = "0";
+      show_program_path = "1";
+      highlight_base_name = "0";
+      highlight_megabytes = "1";
+      highlight_threads = "1";
+      highlight_changes = "0";
+      highlight_changes_delay_secs = "5";
+      find_comm_in_cmdline = "1";
+      strip_exe_from_cmdline = "1";
+      show_merged_command = "0";
+      tree_view = "1";
+      tree_view_always_by_pid = "0";
+      header_margin = "1";
+      detailed_cpu_time = "0";
+      cpu_count_from_one = "0";
+      show_cpu_usage = "1";
+      show_cpu_frequency = "0";
+      show_cpu_temperature = "0";
+      degree_fahrenheit = "0";
+      update_process_names = "0";
+      account_guest_in_cpu_meter = "0";
+      color_scheme = "0";
+      enable_mouse = "1";
+      delay = "15";
+      left_meters = "LeftCPUs2 CPU Memory DiskIO NetworkIO";
+      left_meter_modes = "1 1 1 2 2";
+      right_meters = "RightCPUs2 Tasks LoadAverage Uptime Battery";
+      right_meter_modes = "1 2 2 2 2";
+      hide_function_bar = "0";
     };
+  };
 }
diff --git a/programs/neovim.nix b/programs/neovim.nix
index 7c085db..8656856 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -2,32 +2,32 @@
 
 {
   programs.neovim = {
-      defaultEditor = true;
-      enable = true;
-      viAlias = true;
-      vimAlias = true;
-      vimdiffAlias = true;
-      coc = { enable = true; };
-      extraConfig = ''
-        set title
-        set number
-        set relativenumber
-        set cursorline
-        set mouse=a
-        syntax enable
-        let g:NERDTreeShowHidden = 1
-        let g:NERDTreeMinimalUI = 1
-        let g:NERDTreeIgnore = [ '.git/' ]
-        let g:NERDTreeStatusline = ""
-        let g:NERDTreeMouseMode = 2
-        autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
-        nnoremap <silent> <C-b> :NERDTreeToggle<CR>
-      '';
-      plugins = with pkgs.vimPlugins; [
-        nerdtree
-        vim-devicons
-        # fzf
-        ale
-      ];
-    };
+    defaultEditor = true;
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
+    vimdiffAlias = true;
+    coc = { enable = true; };
+    extraConfig = ''
+      set title
+      set number
+      set relativenumber
+      set cursorline
+      set mouse=a
+      syntax enable
+      let g:NERDTreeShowHidden = 1
+      let g:NERDTreeMinimalUI = 1
+      let g:NERDTreeIgnore = [ '.git/' ]
+      let g:NERDTreeStatusline = ""
+      let g:NERDTreeMouseMode = 2
+      autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
+      nnoremap <silent> <C-b> :NERDTreeToggle<CR>
+    '';
+    plugins = with pkgs.vimPlugins; [
+      nerdtree
+      vim-devicons
+      # fzf
+      ale
+    ];
+  };
 }
diff --git a/programs/starship.nix b/programs/starship.nix
index 36b570b..febafa2 100644
--- a/programs/starship.nix
+++ b/programs/starship.nix
@@ -2,11 +2,11 @@
 
 {
   programs.starship = {
-      enable = true;
-      settings = {
-        add_newline = false;
-        character = { success_symbol = "[❯](bold white)"; };
-        package = { disabled = true; };
-      };
+    enable = true;
+    settings = {
+      add_newline = false;
+      character = { success_symbol = "[❯](bold white)"; };
+      package = { disabled = true; };
     };
+  };
 }
diff --git a/programs/topgrade.nix b/programs/topgrade.nix
index 3cc1146..5912d7b 100644
--- a/programs/topgrade.nix
+++ b/programs/topgrade.nix
@@ -2,15 +2,15 @@
 
 {
   programs.topgrade = {
-      enable = true;
-      settings = {
-        assume_yes = true;
-        ignore_failures = [ "git_repos" ];
-        no_retry = true;
-        pre_sudo = false;
-        cleanup = true;
-        skip_notify = true;
-        firmware = { upgrade = true; };
-      };
+    enable = true;
+    settings = {
+      assume_yes = true;
+      ignore_failures = [ "git_repos" ];
+      no_retry = true;
+      pre_sudo = false;
+      cleanup = true;
+      skip_notify = true;
+      firmware = { upgrade = true; };
     };
+  };
 }
diff --git a/programs/vscode.nix b/programs/vscode.nix
index e3d44cc..a62938a 100644
--- a/programs/vscode.nix
+++ b/programs/vscode.nix
@@ -9,7 +9,9 @@ let
       mkdir $out/bin
       for bin in ${pkg}/bin/*; do
        wrapped_bin=$out/bin/$(basename $bin)
-       echo -e "#!/bin/bash\nexec ${lib.getExe nixgl.auto.nixGLDefault} $bin \$@" > $wrapped_bin
+       echo -e "#!/bin/bash\nexec ${
+         lib.getExe nixgl.auto.nixGLDefault
+       } $bin \$@" > $wrapped_bin
        chmod +x $wrapped_bin
       done
     '';
diff --git a/programs/yt-dlp.nix b/programs/yt-dlp.nix
index 6dc8f6d..4f0c5ae 100644
--- a/programs/yt-dlp.nix
+++ b/programs/yt-dlp.nix
@@ -1,9 +1,6 @@
 { config, pkgs, lib, ... }:
 
 {
-  programs.yt-dlp = {
-      enable = true;
-    };
+  programs.yt-dlp = { enable = true; };
 }
 
-
diff --git a/programs/zsh.nix b/programs/zsh.nix
index 8aadb0f..06af6a2 100644
--- a/programs/zsh.nix
+++ b/programs/zsh.nix
@@ -1,42 +1,50 @@
 { config, pkgs, lib, ... }:
-
-{
+let
+  omz-plugins = [
+    "asdf"
+    "git"
+    "archlinux"
+    "brew"
+    "composer"
+    "colored-man-pages"
+    "extract"
+    "gradle"
+    "node"
+    "npm"
+    "nvm"
+    "rbenv"
+    "sudo"
+    "direnv"
+    "docker"
+    "docker-compose"
+    "golang"
+    "pip"
+    "history"
+    "vagrant"
+  ];
+in {
   programs.zsh = {
-      enable = true;
-      enableAutosuggestions = true;
-      enableCompletion = true;
-      enableSyntaxHighlighting = true;
-      enableVteIntegration = true;
-      shellAliases = {
-        pub-ipv4 = "curl ip4.clerie.de";
-        serve = "python -m SimpleHTTPServer 8080";
-        week = "date +%V";
-        path = "echo -e \${PATH//:/\\n}";
-        distro = "cat /etc/*-release";
-        reload = "source ~/.zshrc";
-        undo-git-reset-head = "git reset 'HEAD@{1}'";
-        update-local = "bash $HOME/.dotfiles/install";
-      };
-      zplug = {
-        enable = true;
-        plugins = [
-          {
-            name = "plugins/git";
-            tags = [ from:oh-my-zsh ];
-          }
-          {
-            name = "plugins/archlinux";
-            tags = [ from:oh-my-zsh ];
-          }
-          {
-            name = "plugins/composer";
-            tags = [ from:oh-my-zsh ];
-          }
-          {
-            name = "plugins/colored-man-pages";
-            tags = [ from:oh-my-zsh ];
-          }
-        ];
-      };
+    enable = true;
+    enableAutosuggestions = true;
+    enableCompletion = true;
+    enableSyntaxHighlighting = true;
+    enableVteIntegration = true;
+    shellAliases = {
+      pub-ipv4 = "curl ip4.clerie.de";
+      serve = "python -m SimpleHTTPServer 8080";
+      week = "date +%V";
+      path = "echo -e \${PATH//:/\\n}";
+      distro = "cat /etc/*-release";
+      reload = "source ~/.zshrc";
+      undo-git-reset-head = "git reset 'HEAD@{1}'";
+      update-local = "bash $HOME/.dotfiles/install";
     };
+    zplug = {
+      enable = true;
+      plugins = map (x: {
+        name = "plugins/${x}";
+        tags = [ "from:oh-my-zsh" ];
+      }) omz-plugins;
+    };
+  };
 }