Compare commits
3 commits
fa6be53b31
...
2da47844ad
Author | SHA1 | Date | |
---|---|---|---|
2da47844ad | |||
b756651051 | |||
c40db05893 |
9 changed files with 23 additions and 36 deletions
|
@ -1,4 +1,9 @@
|
||||||
({ nixpkgs, home-manager, lib, ... }: {
|
{ home-manager, lib, nixpkgs, nur, ... }: {
|
||||||
|
imports = [
|
||||||
|
home-manager.nixosModules.default
|
||||||
|
./overlays/list.nix
|
||||||
|
];
|
||||||
|
|
||||||
# Select internationalisation properties.
|
# Select internationalisation properties.
|
||||||
i18n.defaultLocale = "en_CA.UTF-8";
|
i18n.defaultLocale = "en_CA.UTF-8";
|
||||||
console = {
|
console = {
|
||||||
|
@ -27,7 +32,9 @@
|
||||||
home-manager.users = let
|
home-manager.users = let
|
||||||
default = {
|
default = {
|
||||||
imports = [
|
imports = [
|
||||||
./modules/neovim/nvim.nix
|
nur.hmModules.nur
|
||||||
|
./modules/neovim
|
||||||
|
./modules/bash
|
||||||
];
|
];
|
||||||
home.stateVersion = lib.mkDefault "23.05";
|
home.stateVersion = lib.mkDefault "23.05";
|
||||||
};
|
};
|
||||||
|
@ -35,8 +42,4 @@
|
||||||
root = default;
|
root = default;
|
||||||
matt = default;
|
matt = default;
|
||||||
};
|
};
|
||||||
|
}
|
||||||
imports = [
|
|
||||||
./overlays/list.nix
|
|
||||||
];
|
|
||||||
})
|
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
# Home-manager module
|
||||||
|
|
||||||
{ lib, ... }:
|
{ lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
@ -146,11 +148,11 @@
|
||||||
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
[[ -f ~/.bashrc ]] && . ~/.bashrc
|
||||||
'';
|
'';
|
||||||
bashrcExtra = ''
|
bashrcExtra = ''
|
||||||
${lib.strings.fileContents ../config/bash/dracula/less.sh}
|
${lib.strings.fileContents ./config/dracula/less.sh}
|
||||||
${lib.strings.fileContents ../config/bash/dracula/fzf.sh}
|
${lib.strings.fileContents ./config/dracula/fzf.sh}
|
||||||
|
|
||||||
${lib.strings.fileContents ../config/bash/colorgrid.sh}
|
${lib.strings.fileContents ./config/colorgrid.sh}
|
||||||
${lib.strings.fileContents ../config/bash/bashrc}
|
${lib.strings.fileContents ./config/bashrc}
|
||||||
'';
|
'';
|
||||||
#initExtra = ''
|
#initExtra = ''
|
||||||
#'';
|
#'';
|
12
flake.lock
12
flake.lock
|
@ -279,11 +279,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697368971,
|
"lastModified": 1697393947,
|
||||||
"narHash": "sha256-TVK2EN32mbHO8dtcUlzDpntKJ6yOC+uPJTFJhh6eDjw=",
|
"narHash": "sha256-v0j5RAAfMv9nmjNUCcy+kXq9OIHUR4m5swruMyAgCxo=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "Hyprland",
|
"repo": "Hyprland",
|
||||||
"rev": "43b39e0bc6a83ce190ff09054beb713e0431f19b",
|
"rev": "1f582457cfdea7f2d0d2028f7b3dbabbebd0e164",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -530,11 +530,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1697363080,
|
"lastModified": 1697391992,
|
||||||
"narHash": "sha256-/49Rh5mohp0ZD6HaNbDn9oIsLt+d7Tzbc/BGkb/7o+g=",
|
"narHash": "sha256-J2piU0aOxp3d6hgYyWYF0XlJ/QSM0Vm2vjbJBQZaX6g=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "5771ba6f22db037b037a8bdd82acc5467c965c7e",
|
"rev": "99b3690779c7851e6c79f92b1c8717ec31f11739",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -1,12 +1,6 @@
|
||||||
{ home-manager, nur, ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
## Global config to add home-manager module
|
|
||||||
#############################################################################
|
|
||||||
imports = [
|
|
||||||
home-manager.nixosModules.default
|
|
||||||
];
|
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with 'passwd'.
|
# Define a user account. Don't forget to set a password with 'passwd'.
|
||||||
users.users.matt = {
|
users.users.matt = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
|
@ -14,27 +8,15 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
#############################################################################
|
|
||||||
|
|
||||||
# TODO: use hm for tmux
|
# TODO: use hm for tmux
|
||||||
home-manager.users = {
|
home-manager.users = {
|
||||||
|
|
||||||
root = {
|
|
||||||
imports = [
|
|
||||||
./bashdots.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
home.stateVersion = "23.05";
|
|
||||||
};
|
|
||||||
|
|
||||||
matt = {
|
matt = {
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
nur.hmModules.nur
|
|
||||||
./dconf.nix
|
./dconf.nix
|
||||||
./theme.nix
|
./theme.nix
|
||||||
./hyprland.nix
|
./hyprland.nix
|
||||||
./bashdots.nix
|
|
||||||
./dotfiles.nix
|
./dotfiles.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
./firefox/main.nix
|
./firefox/main.nix
|
||||||
|
|
Loading…
Reference in a new issue