diff options
| -rw-r--r-- | configuration.nix | 29 | ||||
| -rw-r--r-- | modules/git.home.nix | 4 | ||||
| -rw-r--r-- | modules/music.home.nix | 51 | ||||
| -rw-r--r-- | overlays/neovim.nix | 32 | ||||
| -rw-r--r-- | packages.nix | 18 |
5 files changed, 81 insertions, 53 deletions
diff --git a/configuration.nix b/configuration.nix index 00d4759..b32b727 100644 --- a/configuration.nix +++ b/configuration.nix @@ -4,9 +4,10 @@ { config, pkgs, ... }: -let +let localPkgs = import ./packages/default.nix { pkgs = pkgs; }; -in { +in +{ imports = [ <home-manager/nixos> ./hardware-configuration.nix @@ -24,10 +25,20 @@ in { # Network networking = { hostName = "dickhead"; + firewall = { + enable = true; + allowedTCPPorts = [ 8080 ]; + allowedUDPPorts = []; + }; networkmanager.enable = true; - extraHosts = ''''; + extraHosts = '' + 127.0.0.1 dev.parlezvous.io + 127.0.0.1 demo.parlezvous.io + ''; }; + services.atd.enable = true; + virtualisation = { docker.enable = true; lxd.enable = true; @@ -40,7 +51,7 @@ in { # Home manager home-manager.users.imsohexy = { pkgs, ... }: { - imports = [./home.nix]; + imports = [ ./home.nix ]; home = { stateVersion = "21.03"; }; }; @@ -65,11 +76,11 @@ in { ]; # nix-shell -p actkbd --run "sudo actkbd -n -s -d /dev/input/event#" #services.actkbd = { - #enable = true; - #bindings = [ - #{ keys = [ 224 ]; events = [ "key" ]; command = "/run/current-system/sw/bin/light -A 10"; } - #{ keys = [ 225 ]; events = [ "key" ]; command = "/run/current-system/sw/bin/light -U 10"; } - #]; + #enable = true; + #bindings = [ + #{ keys = [ 224 ]; events = [ "key" ]; command = "/run/current-system/sw/bin/light -A 10"; } + #{ keys = [ 225 ]; events = [ "key" ]; command = "/run/current-system/sw/bin/light -U 10"; } + #]; #}; # Enable CUPS to print documents. # services.printing.enable = true; diff --git a/modules/git.home.nix b/modules/git.home.nix index 440a7d5..0d1b792 100644 --- a/modules/git.home.nix +++ b/modules/git.home.nix @@ -17,6 +17,9 @@ "color" = { "ui" = true; }; + "init" = { + defaultBranch = "main"; + }; "color \"diff-highlight\"" = { oldNormal = "red bold"; oldHighlight = "red bold 52"; @@ -31,6 +34,7 @@ new = "green bold"; whitespace = "red reverse"; }; + #"pull" = { rebase = true; }; }; #signing.key = "GPG-KEY-ID"; #signing.signByDefault = true; diff --git a/modules/music.home.nix b/modules/music.home.nix index b7cc0d6..8c5fbcc 100644 --- a/modules/music.home.nix +++ b/modules/music.home.nix @@ -7,14 +7,16 @@ musicDirectory = "${config.home.homeDirectory}/Downloads/music"; playlistDirectory = "${config.home.homeDirectory}/Downloads/music/playlist"; network = { - listenAddress = "0.0.0.0"; + listenAddress = "127.0.0.1"; port = 6600; }; extraConfig = '' + user "imsohexy" + group "users" restore_paused "yes" metadata_to_use "artist,album,title,track,name,genre,date,composer,performer,disc" auto_update "yes" - auto_update_depth "3" + auto_update_depth "5" follow_outside_symlinks "yes" follow_inside_symlinks "yes" input { @@ -26,10 +28,10 @@ device "hw:0,0" } audio_output { - type "fifo" - name "my_fifo" - path "/tmp/mpd.fifo" - format "44100:16:2" + type "fifo" + name "my_fifo" + path "/tmp/mpd.fifo" + format "44100:16:2" } filesystem_charset "UTF-8" ''; @@ -80,23 +82,24 @@ bindings = with builtins; let toBinding = s: let get = elemAt s; in { key = get 0; command = get 1; }; - in map toBinding [ - ["h" ["previous_column" "master_screen" "jump_to_parent_directory"]] - ["l" ["next_column" "slave_screen" "enter_directory"]] - ["k" "scroll_up"] - ["j" "scroll_down"] - ["g" "page_up"] - ["G" "page_down"] - ["d" "delete_playlist_items"] - ["n" "next_found_item"] - ["N" "previous_found_item"] - ["P" "show_playlist_editor"] - ["B" "show_browser"] - ["s" "show_search_engine"] - ["S" "show_search_engine"] - ["ctrl-s" "save_playlist"] - ["c" "clear_main_playlist"] - ["ctrl-l" "show_lyrics"] - ]; + in + map toBinding [ + [ "h" [ "previous_column" "master_screen" "jump_to_parent_directory" ] ] + [ "l" [ "next_column" "slave_screen" "enter_directory" ] ] + [ "k" "scroll_up" ] + [ "j" "scroll_down" ] + [ "g" "page_up" ] + [ "G" "page_down" ] + [ "d" "delete_playlist_items" ] + [ "n" "next_found_item" ] + [ "N" "previous_found_item" ] + [ "P" "show_playlist_editor" ] + [ "B" "show_browser" ] + [ "s" "show_search_engine" ] + [ "S" "show_search_engine" ] + [ "ctrl-s" "save_playlist" ] + [ "c" "clear_main_playlist" ] + [ "ctrl-l" "show_lyrics" ] + ]; }; } diff --git a/overlays/neovim.nix b/overlays/neovim.nix index ee584fb..f10bad9 100644 --- a/overlays/neovim.nix +++ b/overlays/neovim.nix @@ -1,17 +1,21 @@ self: super: { - tree-sitter-updated = super.tree-sitter.overrideAttrs (oldAttrs: { - postInstall = ''PREFIX=$out make install''; - }); - neovim-unwrapped = super.neovim-unwrapped.overrideAttrs (oldAttrs: rec { - name = "neovim-nightly"; - version = "0.5-nightly"; - src = self.fetchFromGitHub { - owner = "neovim"; - repo = "neovim"; - rev = "nightly"; - sha256 = "05659gqaczsschrhbr9q1xbq6bgqai97jpkb2axp3rb2hxv30d1c"; - }; + tree-sitter-updated = super.tree-sitter.overrideAttrs ( + oldAttrs: { + postInstall = ''PREFIX=$out make install''; + } + ); + neovim-unwrapped = super.neovim-unwrapped.overrideAttrs ( + oldAttrs: rec { + name = "neovim-nightly"; + version = "0.5-nightly"; + src = self.fetchFromGitHub { + owner = "neovim"; + repo = "neovim"; + rev = "nightly"; + sha256 = "1h1idmlyvydkihfr2n1bsp8c2w9jnlgvm7jqc0gmr4cvwaflcydf"; + }; - nativeBuildInputs = with self.pkgs; [ unzip cmake pkgconfig gettext tree-sitter-updated ]; - }); + nativeBuildInputs = with self.pkgs; [ unzip cmake pkgconfig gettext tree-sitter-updated ]; + } + ); } diff --git a/packages.nix b/packages.nix index c0c1935..225cdfa 100644 --- a/packages.nix +++ b/packages.nix @@ -21,6 +21,8 @@ let ctags fzf + gcc + gnumake nodejs-15_x python3 rustup @@ -30,11 +32,13 @@ let # haskell-language-server # cabal-install # ghc - ] ++ (with pkgs.nodePackages; [ - typescript - typescript-language-server - bash-language-server - ]); + ] ++ ( + with pkgs.nodePackages; [ + typescript + typescript-language-server + bash-language-server + ] + ); apps = with pkgs; [ # Browser @@ -72,6 +76,7 @@ let pciutils udiskie file + at # X stuff bc @@ -84,7 +89,8 @@ let xdo xdotool ]; -in { +in +{ # Packages environment.systemPackages = devPackages ++ customPackages ++ apps ++ utils; |