mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-11-06 03:12:24 +00:00
Update nix
This commit is contained in:
elkowar
parent
324302cc3c
commit
67268815e0
11 changed files with 53 additions and 39 deletions
|
|
@ -1,4 +1,4 @@
|
|||
{
|
||||
"optOut": false,
|
||||
"lastUpdateCheck": 1597756945539
|
||||
"lastUpdateCheck": 1598261358949
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
/nix/store/h2i643kribbs0wngd2sinhr1p3dj2ib0-home-manager-files/.config/htop/htoprc
|
||||
/nix/store/9pbs833w662kd30yb8q5lr0s7qvryzkr-home-manager-files/.config/htop/htoprc
|
||||
|
|
@ -128,7 +128,7 @@ scratchpads =
|
|||
where
|
||||
--launchWhatsapp = "gtk-launch chrome-hnpfjngllnobngcgfapefoaidbinmjnm-Default.desktop"
|
||||
launchWhatsapp = "google-chrome-stable --start-fullscreen -kiosk --app='https://web.whatsapp.com'"
|
||||
launchDiscord = "Discord"
|
||||
launchDiscord = "discocss"
|
||||
--launchDiscord = "beautifuldiscord --css /home/leon/.config/beautifuldiscord/custom_discord.css"
|
||||
|
||||
|
||||
|
|
@ -231,6 +231,8 @@ myStartupHook = do
|
|||
spawnOnce "redshift -P -O 5000 &"
|
||||
spawn "xset r rate 300 50 &" -- make key repeat quicker
|
||||
spawn "/home/leon/.screenlayout/dualscreen-stacked.sh"
|
||||
spawnOnce "xsetroot -cursor_name left_ptr"
|
||||
spawnOnce "xrdb -merge ~/.Xresources"
|
||||
io $ threadDelay $ 1000 * 100
|
||||
spawnOnce "/home/leon/Downloads/picom --config /home/leon/.config/picom.conf --experimental-backends --backend xrender" --no-fading-openclose"
|
||||
spawn "/home/leon/.config/polybar/launch.sh"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,9 @@
|
|||
{
|
||||
nixpkgs.config = {
|
||||
allowUnfree = true;
|
||||
overlays = [ (import ./overlay) ];
|
||||
overlays = [
|
||||
(import ./overlay)
|
||||
];
|
||||
|
||||
packageOverrides = pkgs: {
|
||||
nur = import (builtins.fetchTarball "https://github.com/nix-community/NUR/archive/master.tar.gz") {
|
||||
|
|
@ -26,6 +28,7 @@
|
|||
enable = true;
|
||||
enableFish = true;
|
||||
enableZsh = true;
|
||||
includeNiceToHaves = true;
|
||||
};
|
||||
desktop.enable = true;
|
||||
desktop.colors = import ./modules/desktop/colors/gruvbox.nix;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.elkowar.base;
|
||||
elkowar_local = import ../local/default.nix { };
|
||||
myConf = import ../myConfig.nix;
|
||||
elkowar_local = import ../local/default.nix {};
|
||||
sources = import ../nix/sources.nix;
|
||||
in
|
||||
{
|
||||
|
|
@ -10,6 +9,7 @@ in
|
|||
enable = lib.mkEnableOption "Basic profile enabled";
|
||||
enableFish = lib.mkEnableOption "Fish shell";
|
||||
enableZsh = lib.mkEnableOption "Zsh shell";
|
||||
includeNiceToHaves = lib.mkEnableOption "Add nice-to-have, non-essential programs";
|
||||
};
|
||||
|
||||
imports = [ ./term ./generalConfig.nix ];
|
||||
|
|
@ -20,35 +20,43 @@ in
|
|||
elkowar.programs.fish.enable = cfg.enableFish;
|
||||
elkowar.generalConfig.shellAbbrs = {
|
||||
vim = "nvim";
|
||||
tsh = "trash";
|
||||
cxmonad = "nvim /home/leon/.xmonad/lib/Config.hs";
|
||||
cxmonad = "cd ~/.xmonad && nvim /home/leon/.xmonad/lib/Config.hs && cd -";
|
||||
cnix = "cd ~/nixpkgs/ && nvim home.nix && cd -";
|
||||
cvim = "cd ~/.config/nvim/ && nvim init.vim && cd -";
|
||||
|
||||
gaa = "git add --all";
|
||||
gc = "git commit -m ";
|
||||
gp = "git push";
|
||||
gs = "git status";
|
||||
gst = "git status";
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
(pkgs.callPackage ../packages/fet.sh.nix { })
|
||||
sources.manix
|
||||
direnv
|
||||
rnix-lsp
|
||||
nix-prefetch-git
|
||||
gtop
|
||||
bat
|
||||
websocat
|
||||
niv
|
||||
exa
|
||||
trash-cli
|
||||
mdcat
|
||||
github-cli
|
||||
haskellPackages.nix-tree
|
||||
ripgrep
|
||||
fd
|
||||
jq
|
||||
home.packages = with pkgs; lib.mkMerge [
|
||||
[
|
||||
sources.manix
|
||||
direnv
|
||||
rnix-lsp
|
||||
nix-prefetch-git
|
||||
niv
|
||||
bat
|
||||
exa
|
||||
trash-cli
|
||||
ripgrep
|
||||
fd
|
||||
jq
|
||||
|
||||
cachix
|
||||
]
|
||||
(
|
||||
lib.mkIf cfg.includeNiceToHaves [
|
||||
haskellPackages.nix-tree
|
||||
cloc
|
||||
fet-sh
|
||||
mdcat
|
||||
github-cli
|
||||
websocat
|
||||
gtop
|
||||
]
|
||||
)
|
||||
];
|
||||
|
||||
programs = {
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{...}: { imports = [ ./desktop ./term ./base.nix ./desktop.nix ./generalConfig.nix]; }
|
||||
{ ... }: { imports = [ ./desktop ./term ./base.nix ./desktop.nix ./generalConfig.nix ]; }
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ in
|
|||
''
|
||||
);
|
||||
settings = {
|
||||
live_config_reload = true;
|
||||
window = {
|
||||
padding.x = 20;
|
||||
padding.y = 20;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
cfg = config.elkowar.programs.rofi;
|
||||
myConf = import ../myConfig.nix;
|
||||
in
|
||||
{
|
||||
options.elkowar.programs.rofi = {
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ in
|
|||
keyMode = "vi";
|
||||
shortcut = "y";
|
||||
terminal = "tmux-256color";
|
||||
escapeTime = 0;
|
||||
customPaneNavigationAndResize = true;
|
||||
extraConfig = ''
|
||||
bind v split-window -h -c "#{pane_current_oath}"
|
||||
|
|
|
|||
|
|
@ -5,10 +5,10 @@
|
|||
"homepage": null,
|
||||
"owner": "mlvzk",
|
||||
"repo": "manix",
|
||||
"rev": "a2eb8111f779903fed3ce8e411dd3e255466ada5",
|
||||
"sha256": "03pp4ij0bg9chqlqanymjh7iqcjb46nzbjc5wn5i7gyjfrcz7j54",
|
||||
"rev": "01895e6ac53a9d40c6f5f783263f4875924ad712",
|
||||
"sha256": "06cn51h8nab85jk4jfhri3v9kvhb4lpni3qk0mn3dvcw5sg5ri2n",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/mlvzk/manix/archive/a2eb8111f779903fed3ce8e411dd3e255466ada5.tar.gz",
|
||||
"url": "https://github.com/mlvzk/manix/archive/01895e6ac53a9d40c6f5f783263f4875924ad712.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"niv": {
|
||||
|
|
@ -17,10 +17,10 @@
|
|||
"homepage": "https://github.com/nmattia/niv",
|
||||
"owner": "nmattia",
|
||||
"repo": "niv",
|
||||
"rev": "e82eb322ea32a747a51c431d7787221bcc6d9038",
|
||||
"sha256": "1fy4dcr05d80diwlxmh42xnjm5ki1pkbky38smvlqjaky2y2f71f",
|
||||
"rev": "89ae775e9dfc2571f912156dd2f8627e14d4d507",
|
||||
"sha256": "0ssw6byyn79fpyzswi28s5b85x66xh4xsfhmcfl5mkdxxpmyy0ns",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/nmattia/niv/archive/e82eb322ea32a747a51c431d7787221bcc6d9038.tar.gz",
|
||||
"url": "https://github.com/nmattia/niv/archive/89ae775e9dfc2571f912156dd2f8627e14d4d507.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"nixpkgs": {
|
||||
|
|
@ -29,10 +29,10 @@
|
|||
"homepage": null,
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9319284c1d02e2969bb6340e691e06105e87015f",
|
||||
"sha256": "1g3wli01qnbjmf9x2wqfjk65z9h94cglrljpcc0slz5g0g6pjg99",
|
||||
"rev": "14006b724f3d1f25ecf38238ee723d38b0c2f4ce",
|
||||
"sha256": "07hfbilyh818pigfn342v2r05n8061wpjaf1m4h291lf6ydjagis",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/9319284c1d02e2969bb6340e691e06105e87015f.tar.gz",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/14006b724f3d1f25ecf38238ee723d38b0c2f4ce.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
self: super: {
|
||||
cool-retro-term = super.callPackage ./cool-retro-term.nix { };
|
||||
cool-retro-term = super.callPackage ./cool-retro-term.nix {};
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue