Compare commits
11 Commits
4a48170f1d
...
7b959ee797
Author | SHA1 | Date |
---|---|---|
Jez Cope | 7b959ee797 | |
Jez Cope | cc928ae9ca | |
Jez Cope | fcf240f541 | |
Jez Cope | 938f65c384 | |
Jez Cope | 3736857bf6 | |
Jez Cope | 2d6dec4b12 | |
Jez Cope | 94e6621b69 | |
Jez Cope | f187812feb | |
Jez Cope | 58599d5977 | |
Jez Cope | d91e7e222b | |
Jez Cope | 27901cd7e1 |
|
@ -124,6 +124,7 @@
|
|||
tree
|
||||
iputils
|
||||
ripgrep
|
||||
usbutils
|
||||
|
||||
protonvpn-cli
|
||||
|
||||
|
@ -149,7 +150,10 @@
|
|||
desktopManager.mate.enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
desktopManager.gnome.flashback.enableMetacity = true;
|
||||
windowManager.i3.enable = true;
|
||||
windowManager.i3 = {
|
||||
enable = true;
|
||||
package = pkgs.i3-gaps;
|
||||
};
|
||||
};
|
||||
programs.sway = {
|
||||
enable = true;
|
||||
|
|
48
flake.lock
48
flake.lock
|
@ -8,11 +8,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1653021638,
|
||||
"narHash": "sha256-Bj3J5MzbefNsp73183kKP903r44dvBi6qHqPzezXMWk=",
|
||||
"lastModified": 1656413262,
|
||||
"narHash": "sha256-I8X1LaW/qoSWeBLK0N8GPOshIuXG9zyNyZUtKZYa0h4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "6208712709671ce25b931433f8b81e2e30346f73",
|
||||
"rev": "8772891c73e2809df5e5469d14535ea77e123d3e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -23,11 +23,11 @@
|
|||
},
|
||||
"flake-utils": {
|
||||
"locked": {
|
||||
"lastModified": 1652776076,
|
||||
"narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
|
||||
"lastModified": 1656065134,
|
||||
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
|
||||
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -40,14 +40,15 @@
|
|||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1652996682,
|
||||
"narHash": "sha256-7ZWyd5W2tM/uxXGn16AJUXenlGPUt/r6zitEcorz5j0=",
|
||||
"lastModified": 1656367977,
|
||||
"narHash": "sha256-0hV17V9Up9pnAtPJ+787FhrsPnawxoTPA/VxgjRMrjc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "02b15de8ad714409358cffdc6ed518ade03402c4",
|
||||
"rev": "3bf16c0fd141c28312be52945d1543f9ce557bb1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -58,11 +59,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1652885393,
|
||||
"narHash": "sha256-YIgvvlk4iQ1Hi7KD9o5gsojc+ApB+jiH1d5stK8uXiw=",
|
||||
"lastModified": 1656239181,
|
||||
"narHash": "sha256-wW1xRFBn376yGloXZ4QzBE4hjipMawpV18Lshd9QSPw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "48037fd90426e44e4bf03e6479e88a11453b9b66",
|
||||
"rev": "f2537a505d45c31fe5d9c27ea9829b6f4c4e6ac5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -73,11 +74,11 @@
|
|||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1653042409,
|
||||
"narHash": "sha256-P3h+rDxT1AScFhwc8MconD5AnhmWykoEMNDatP6IEMU=",
|
||||
"lastModified": 1656440741,
|
||||
"narHash": "sha256-Apn2V5plV2vNHj4JrwClsI67H+Ab/7QmVDXPVaf0L3I=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "f27711d8edb9480dfb1c3c899987df4b94aa2bed",
|
||||
"rev": "c77b7b770d126310e79a847e2ef06d6a8a2e4a19",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -93,6 +94,21 @@
|
|||
"nixpkgs": "nixpkgs",
|
||||
"nur": "nur"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1653893745,
|
||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
@ -55,7 +55,6 @@ in {
|
|||
mercurialFull
|
||||
weechat
|
||||
borgbackup
|
||||
hydroxide
|
||||
mblaze
|
||||
|
||||
gnutar
|
||||
|
|
|
@ -18,7 +18,6 @@ with lib;
|
|||
mate.caja
|
||||
libreoffice-fresh
|
||||
inkscape
|
||||
glimpse
|
||||
krita
|
||||
nyxt
|
||||
lagrange
|
||||
|
@ -31,6 +30,7 @@ with lib;
|
|||
logseq
|
||||
flameshot
|
||||
gitkraken
|
||||
discord
|
||||
|
||||
openshot-qt
|
||||
blender
|
||||
|
@ -179,6 +179,24 @@ with lib;
|
|||
'';
|
||||
};
|
||||
|
||||
programs.alacritty = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
font = {
|
||||
normal.family = "Iosevka";
|
||||
size = 11;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
plugins = [ pkgs.rofi-emoji pkgs.rofi-pass ];
|
||||
theme = "gruvbox-dark-soft";
|
||||
terminal = pkgs.alacritty + /bin/alacritty;
|
||||
};
|
||||
|
||||
programs.chromium.enable = true;
|
||||
programs.chromium.package = pkgs.ungoogled-chromium;
|
||||
programs.qutebrowser.enable = true;
|
||||
|
|
|
@ -0,0 +1,79 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
modifier = "Mod4";
|
||||
left = "h";
|
||||
down = "t";
|
||||
up = "n";
|
||||
right = "s";
|
||||
|
||||
cmds = rec {
|
||||
alacritty = pkgs.alacritty + /bin/alacritty;
|
||||
rofi = config.programs.rofi.finalPackage + /bin/rofi;
|
||||
playerctl = pkgs.playerctl + /bin/playerctl;
|
||||
pamixer = pkgs.pamixer + /bin/pamixer;
|
||||
|
||||
term = "${alacritty}";
|
||||
menu = "${rofi} -show drun";
|
||||
};
|
||||
in {
|
||||
xsession.windowManager.i3 = {
|
||||
enable = true;
|
||||
|
||||
config = {
|
||||
inherit modifier;
|
||||
|
||||
window = {
|
||||
titlebar = true;
|
||||
border = 0;
|
||||
};
|
||||
|
||||
gaps.inner = 16;
|
||||
fonts = {
|
||||
names = [ "Iosevka" ];
|
||||
size = 12.0;
|
||||
};
|
||||
|
||||
bars = [{
|
||||
mode = "dock";
|
||||
position = "top";
|
||||
workspaceButtons = true;
|
||||
workspaceNumbers = true;
|
||||
statusCommand = "${pkgs.i3status}/bin/i3status";
|
||||
fonts = {
|
||||
names = [ "Iosevka" ];
|
||||
size = 11.0;
|
||||
};
|
||||
}];
|
||||
|
||||
keybindings = let mod = config.xsession.windowManager.i3.config.modifier;
|
||||
in lib.mkOptionDefault {
|
||||
"${mod}+Return" = "exec ${cmds.term}";
|
||||
"${mod}+d" = "exec ${cmds.menu}";
|
||||
"${mod}+Shift+c" = "kill";
|
||||
|
||||
"${mod}+${left}" = "focus left";
|
||||
"${mod}+${down}" = "focus down";
|
||||
"${mod}+${up}" = "focus up";
|
||||
"${mod}+${right}" = "focus right";
|
||||
|
||||
"${mod}+Shift+${left}" = "move left";
|
||||
"${mod}+Shift+${down}" = "move down";
|
||||
"${mod}+Shift+${up}" = "move up";
|
||||
"${mod}+Shift+${right}" = "move right";
|
||||
|
||||
"${mod}+Ctrl+${left}" = "move workspace to output left";
|
||||
"${mod}+Ctrl+${right}" = "move workspace to output right";
|
||||
"${mod}+Ctrl+Left" = "move workspace to output left";
|
||||
"${mod}+Ctrl+Right" = "move workspace to output right";
|
||||
|
||||
XF86AudioPlay = "exec ${cmds.playerctl} play-pause";
|
||||
XF86AudioNext = "exec ${cmds.playerctl} next";
|
||||
XF86AudioPrev = "exec ${cmds.playerctl} prev";
|
||||
XF86AudioStop = "exec ${cmds.playerctl} stop";
|
||||
XF86AudioRaiseVolume = "exec ${cmds.pamixer} --increase 5";
|
||||
XF86AudioLowerVolume = "exec ${cmds.pamixer} --decrease 5";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue