diff --git a/flake.nix b/flake.nix index 43cb480..7f357eb 100644 --- a/flake.nix +++ b/flake.nix @@ -49,14 +49,16 @@ # Configurations for non-NixOS machines. homeConfigurations = with home-manager.lib; { - "dev-lt-63" = homeManagerConfiguration { pkgs = nixpkgs.legacyPackages."x86_64-linux"; modules = [ (mkUserConfig ./system/dev-lt-63) ]; }; + }; + overlays = { + default = (import ./shared/overlay.nix); }; }; diff --git a/shared/core/default.nix b/shared/core/default.nix index e153500..75c2891 100644 --- a/shared/core/default.nix +++ b/shared/core/default.nix @@ -6,6 +6,7 @@ ./gui/pipewire.nix ./gui/sway.nix ./nix.nix + ./ssh.nix ]; config = { diff --git a/shared/core/ssh.nix b/shared/core/ssh.nix new file mode 100644 index 0000000..037fd0e --- /dev/null +++ b/shared/core/ssh.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: + +{ + + services.openssh = { + enable = true; + settings.passwordAuthentication = false; + }; + + users.users."riley" = { + packages = [ pkgs.openssh ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDroUHLf56zlYLiMoD1JV5XXZNwY9tftobDttC6hnfiM riley@dev-lt-63" + ]; + }; + +} \ No newline at end of file diff --git a/shared/home/default.nix b/shared/home/default.nix index 14adf05..55a5876 100644 --- a/shared/home/default.nix +++ b/shared/home/default.nix @@ -6,6 +6,7 @@ ./bash.nix ./git.nix ./nix.nix + ./mpd.nix ./programs.nix ./theme.nix ./gui diff --git a/shared/home/mpd.nix b/shared/home/mpd.nix new file mode 100644 index 0000000..bb1fce4 --- /dev/null +++ b/shared/home/mpd.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + services.mpd = { + enable = true; + }; + + programs.ncmpcpp = { + enable = true; + }; + + home.packages = with pkgs; [ + mpc_cli + ]; +} \ No newline at end of file diff --git a/shared/home/nix.nix b/shared/home/nix.nix index 3b78fd9..3a1df5f 100644 --- a/shared/home/nix.nix +++ b/shared/home/nix.nix @@ -10,4 +10,8 @@ allowUnfree = true; }; + nixpkgs.overlays = [ + (import ../overlay.nix) + ]; + } \ No newline at end of file diff --git a/shared/home/programs.nix b/shared/home/programs.nix index 2a83a11..5feec6b 100644 --- a/shared/home/programs.nix +++ b/shared/home/programs.nix @@ -31,4 +31,11 @@ programs.skim.enable = true; programs.zoxide.enable = true; + programs.helix = { + enable = true; + settings = { + theme = "github_dark_dimmed"; + }; + }; + } \ No newline at end of file diff --git a/shared/lib.nix b/shared/lib.nix index 4169dcd..e399524 100644 --- a/shared/lib.nix +++ b/shared/lib.nix @@ -9,5 +9,9 @@ with pkgs; rec { nixGLWrapper = program: writeShellScriptBin program.pname '' ${nixGL}/bin/nixGL ${program}/bin/${program.pname} "$@" ''; - + + webApp = name: url: writeShellScriptBin name '' + ${chromium}/bin/chromium --app ${url} + ''; + } \ No newline at end of file diff --git a/shared/overlay.nix b/shared/overlay.nix new file mode 100644 index 0000000..28b8ce1 --- /dev/null +++ b/shared/overlay.nix @@ -0,0 +1,9 @@ +final: prev: + +with (import ./lib.nix final); { + element-web = webApp "element" "https://riot.badat.dev"; + youtube-web = webApp "youtube" "https://youtube.com"; + github-web = webApp "github" "https://github.com"; + bitwarden-web = webApp "bitwarden" "https://vault.steph.tools"; + hoogle-web = webApp "hoogle" "https://hoogle.haskell.org"; +} \ No newline at end of file diff --git a/system/dev-lt-63/home.nix b/system/dev-lt-63/home.nix index 0742e12..d196e1f 100644 --- a/system/dev-lt-63/home.nix +++ b/system/dev-lt-63/home.nix @@ -6,7 +6,29 @@ homeDirectory = "/home/riley"; stateVersion = "22.05"; }; + programs = { home-manager.enable = false; }; + + xdg.systemDirs.data = [ "/usr/share" "/usr/local/share" ]; + fonts.fontconfig.enable = true; + + services.dunst = { + enable = true; + settings = { + global = { + font = "Fira Code 9"; + origin = "top-center"; + offset = "10x10"; + frame_width = "2"; + frame_color = "#ffffff"; + width = "400"; + }; + urgency_normal.background = "#212121"; + }; + }; + + programs.man.enable = false; + } \ No newline at end of file