dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit 440726817fe20bc8df67bb742814eb850964bca4 parent 2b997c4bf99ace2de97bfc49a4234052735066ea Author: maydayv7 <maydayv7@gmail.com> Date: Sat, 25 Jun 2022 19:49:54 +0530 fix: Routine Changes Fixes: + Update `discord` + Document `home-manager` setup
Diffstat:
| M | README.md | | | 3 | +++ |
| M | files/default.nix | | | 1 | - |
| M | modules/apps/firefox.nix | | | 6 | ++++++ |
| M | modules/gui/gnome.nix | | | 3 | --- |
| M | packages/overlays/discord.nix | | | 4 | ++-- |
| M | site/content/anime.md | | | 2 | +- |
| M | users/navya.nix | | | 2 | +- |
| D | users/v7.nix | | | 30 | ------------------------------ |
| R | files/gnome/accounts.conf -> users/v7/accounts.conf | | | 0 | |
| A | users/v7/default.nix | | | 33 | +++++++++++++++++++++++++++++++++ |
10 files changed, 46 insertions(+), 38 deletions(-)
diff --git a/README.md b/README.md @@ -345,6 +345,9 @@ The system may be set up using either a `simple` or `advanced` filesystem layout All important, persisted user files are stored at `/data`. Personal files and media are stored on an NTFS partition mounted to `/data/files` +### Home Manager +The [`home-manager`](https://github.com/nix-community/home-manager) module is used in tandem with the system configuration in order to define user-specific configuration. The `config.user.home` option has been declared in [`modules/user/default.nix`](./modules/user/default.nix) independent of the original module, from which the final configuration is built, in order to prevent infinite recursion while configuring multiple users per system. The system `config` can be accessed using the `sys` parameter in `home-manager` modules + ## Links ### Theming diff --git a/files/default.nix b/files/default.nix @@ -41,7 +41,6 @@ in rec { # GNOME Desktop gnome = { - accounts = readFile ./gnome/accounts.conf; dconf = ./gnome/dconf.nix; iso = readFile ./gnome/iso; syntax = readFile ./gnome/nix.lang; diff --git a/modules/apps/firefox.nix b/modules/apps/firefox.nix @@ -15,6 +15,12 @@ in { sessionVariables.MOZ_USE_XINPUT2 = "1"; }; + # Desktop Integration + xdg.portal = { + enable = true; + extraPortals = [pkgs.xdg-desktop-portal-wlr]; + }; + user = { persist.dirs = [".cache/mozilla/firefox" ".mozilla/firefox"]; home = { diff --git a/modules/gui/gnome.nix b/modules/gui/gnome.nix @@ -113,9 +113,6 @@ in { # Initial Setup ".config/gnome-initial-setup-done".text = "yes"; - # Online Accounts - ".config/goa-1.0/accounts.conf".text = gnome.accounts; - # GTK+ Bookmarks ".config/gtk-3.0/bookmarks".text = gtk.bookmarks; diff --git a/packages/overlays/discord.nix b/packages/overlays/discord.nix @@ -1,11 +1,11 @@ final: prev: { # Update Discord to Latest Version discord = prev.discord.overrideAttrs (_: rec { - version = "0.0.17"; + version = "0.0.18"; src = prev.fetchzip { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "sha256-a/XAwkOON2BLsi6x5Bp83NfTI0JadYqY+LfcK5GLr0E="; + sha256 = "sha256-FXQuNbCBsJ61UvR98CycPkceRhYiP6Jyw90DFjZVEq4="; }; }); } diff --git a/site/content/anime.md b/site/content/anime.md @@ -40,6 +40,7 @@ comments = true - Rent-a-Girlfriend <sup>\*</sup> - RikeKoi <sup>#</sup> - Scums Wish <sup>\*</sup> +- Steins;Gate <sup>#</sup> - The Pet Girl of Sakurasou <sup>\*</sup> - The Quintessential Quintuplets <sup>#</sup> - Tonikawa: To the Moon! <sup>\*</sup> @@ -63,7 +64,6 @@ comments = true - [ ] Gosick - [x] Hyouka - [ ] One Outs -- [ ] Steins;Gate <sup>#</sup> - [ ] Skilled Teaser Takagi-san <sup>#</sup> - [ ] A Place Further than the Universe diff --git a/users/navya.nix b/users/navya.nix @@ -1,5 +1,5 @@ {files, ...}: { - # Credentials + # Personal Credentials credentials = { fullname = "Navya G"; mail = "gnavya009@gmail.com"; diff --git a/users/v7.nix b/users/v7.nix @@ -1,30 +0,0 @@ -{ - config, - pkgs, - files, - ... -}: -with files; { - # Credentials - credentials = { - name = "maydayv7"; - fullname = "V7"; - mail = "maydayv7@gmail.com"; - key = "8C240C0C11293EE56260601CCF616EB19C2765E4"; - }; - - # Home Configuration - home = { - packages = [pkgs.home-manager]; - - # Directory Symlinks - file = { - # Profile Picture - ".face".source = images.profile; - - # Dotfiles - "Projects/dotfiles".source = - config.lib.file.mkOutOfStoreSymlink path.system; - }; - }; -} diff --git a/files/gnome/accounts.conf b/users/v7/accounts.conf diff --git a/users/v7/default.nix b/users/v7/default.nix @@ -0,0 +1,33 @@ +{ + config, + pkgs, + files, + ... +}: +with files; { + # Personal Credentials + credentials = { + name = "maydayv7"; + fullname = "V7"; + mail = "maydayv7@gmail.com"; + key = "8C240C0C11293EE56260601CCF616EB19C2765E4"; + }; + + # Home Configuration + home = { + packages = [pkgs.home-manager]; + + # Directory Symlinks + file = { + # Profile Picture + ".face".source = images.profile; + + # Online Accounts + ".config/goa-1.0/accounts.conf".text = builtins.readFile ./accounts.conf; + + # Dotfiles + "Projects/dotfiles".source = + config.lib.file.mkOutOfStoreSymlink path.system; + }; + }; +}