pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove some hyprland workspaces, add emacs bind

Browse source
This commit is contained in:
Evie Litherland-Smith 2023-07-26 11:04:41 +01:00
parent f3e8b1a38e
commit 272669bcbc
4 changed files with 41 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
flake.lock
View file

@ -2,15 +2,14 @@
"nodes": { "nodes": {
"doom-emacs": { "doom-emacs": {
"inputs": { "inputs": {
"doom-emacs": "doom-emacs_2",
"emacs-overlay": "emacs-overlay" "emacs-overlay": "emacs-overlay"
}, },
"locked": { "locked": {
"lastModified": 1690297243, "lastModified": 1690365066,
"narHash": "sha256-ExZs7PnEqzXZHZaJN/G9OVR1u95/wPRsY+xXr36hI3c=", "narHash": "sha256-s/L/tSZYb5+Ijhf7wOaf+rhoW9R8FIdLphMYpr62JeY=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "8174c06eb53083658b2b72ca9e82201ceba3d54e", "rev": "5b1259840d7f5e5ac379f7b4cce5fa53974aff52",
"revCount": 5, "revCount": 11,
"type": "git", "type": "git",
"url": "https://git.xenia.me.uk/xenia/emacs.git" "url": "https://git.xenia.me.uk/xenia/emacs.git"
}, },
@ -19,22 +18,6 @@
"url": "https://git.xenia.me.uk/xenia/emacs.git" "url": "https://git.xenia.me.uk/xenia/emacs.git"
} }
}, },
"doom-emacs_2": {
"flake": false,
"locked": {
"lastModified": 1690233934,
"narHash": "sha256-9jxiQK+jDMRrpbqoMlYyED3AbPY2euj53wU7ESO1spk=",
"owner": "doomemacs",
"repo": "doomemacs",
"rev": "06c891e177ffd9d25c67f24605604fe3fa00e004",
"type": "github"
},
"original": {
"owner": "doomemacs",
"repo": "doomemacs",
"type": "github"
}
},
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",

15
flake.nix
View file

@ -54,18 +54,12 @@
Vanguard = let hostname = "Vanguard"; Vanguard = let hostname = "Vanguard";
in nixpkgs.lib.nixosSystem { in nixpkgs.lib.nixosSystem {
inherit pkgs specialArgs; inherit pkgs specialArgs;
modules = [ modules = [ ./hosts/${hostname}/configuration.nix ];
./hosts/${hostname}/configuration.nix
doom-emacs.outputs.nixosModules.default
];
}; };
Ronin = let hostname = "Ronin"; Ronin = let hostname = "Ronin";
in nixpkgs.lib.nixosSystem { in nixpkgs.lib.nixosSystem {
inherit pkgs specialArgs; inherit pkgs specialArgs;
modules = [ modules = [ ./hosts/${hostname}/configuration.nix ];
./hosts/${hostname}/configuration.nix
doom-emacs.outputs.nixosModules.default
];
}; };
}; };
homeConfigurations = let homeConfigurations = let
@ -106,7 +100,10 @@
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in home-manager.lib.homeManagerConfiguration { in home-manager.lib.homeManagerConfiguration {
inherit pkgs extraSpecialArgs; inherit pkgs extraSpecialArgs;
modules = [ ./hosts/${hostname}/home.nix ]; modules = [
./hosts/${hostname}/home.nix
doom-emacs.outputs.homeManagerModules.default
];
}; };
}; };
}; };

79
home/hyprland/hyprland.conf
View file

@ -81,9 +81,7 @@ bind = SUPER, F1, exec, swaylock
bind = SUPER, Space, exec, pkill rofi || rofi -show drun bind = SUPER, Space, exec, pkill rofi || rofi -show drun
bind = SUPER SHIFT, Space, exec, pkill rofi || rofi -show run bind = SUPER SHIFT, Space, exec, pkill rofi || rofi -show run
bind = SUPER, E, exec, pkill rofi || rofi -show file-browser-extended bind = SUPER, E, exec, emacsclient -c -a 'emacs'
bind = SUPER SHIFT, Return, exec, pkill rofi || rofi -show ssh
bind = SUPER, P, exec, pkill rofi || rofi -show top
bind = SUPER SHIFT, P, exec, pkill rofi || rofi -show power-menu bind = SUPER SHIFT, P, exec, pkill rofi || rofi -show power-menu
bind = SUPER, V, togglefloating bind = SUPER, V, togglefloating
@ -111,64 +109,41 @@ bind = SUPER SHIFT, J, movewindow, d
bind = SUPER, A, workspace, 1 bind = SUPER, A, workspace, 1
bind = SUPER SHIFT, A, moveworkspacetomonitor, 1 current bind = SUPER SHIFT, A, moveworkspacetomonitor, 1 current
bind = SUPER SHIFT, A, workspace, 1 bind = SUPER SHIFT, A, workspace, 1
windowrule = workspace 1,^(steam).*
windowrule = workspace 1,(.gamescope-wrapped)
# 2: dev # 2: browser
bind = SUPER, D, workspace, 2 bind = SUPER, W, workspace, 2
bind = SUPER SHIFT, D, moveworkspacetomonitor, 2 current bind = SUPER SHIFT, W, moveworkspacetomonitor, 2 current
bind = SUPER SHIFT, D, workspace, 2 bind = SUPER SHIFT, W, workspace, 2
windowrule = workspace 2,(firefox)
# 3: browser windowrule = workspace 2,(chromium-browser)
bind = SUPER, W, workspace, 3
bind = SUPER SHIFT, W, moveworkspacetomonitor, 3 current
bind = SUPER SHIFT, W, workspace, 3
windowrule = workspace 3,(firefox)
windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox) windowrulev2 = float,title:(File|Picture-in-Picture),class:(firefox)
windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox) windowrulev2 = pin,title:(File|Picture-in-Picture),class:(firefox)
# 4: files # 3: files
bind = SUPER, F, workspace, 4 bind = SUPER, F, workspace, 3
bind = SUPER SHIFT, F, moveworkspacetomonitor, 4 current bind = SUPER SHIFT, F, moveworkspacetomonitor, 3 current
bind = SUPER SHIFT, F, workspace, 4 bind = SUPER SHIFT, F, workspace, 3
windowrule = workspace 4,^(libreoffice).* windowrule = workspace 3,^(libreoffice).*
windowrule = workspace 4,(Zotero) windowrule = workspace 3,(Zotero)
# 5: chat # 4: chat
bind = SUPER, C, workspace, 5 bind = SUPER, C, workspace, 4
bind = SUPER SHIFT, C, moveworkspacetomonitor, 5 current bind = SUPER SHIFT, C, moveworkspacetomonitor, 4 current
bind = SUPER SHIFT, C, workspace, 5 bind = SUPER SHIFT, C, workspace, 4
windowrule = workspace 5,(Signal) windowrule = workspace 4,(Signal)
windowrule = workspace 5,(fractal) windowrule = workspace 4,(fractal)
windowrule = workspace 5,(discord) windowrule = workspace 4,(discord)
windowrule = workspace 5,^(teams-for-linux).*
windowrulev2 = workspace 5,title:^(Zoom|zoom).*
windowrulev2 = float,title:^(Zoom|zoom).*
# 6: mail # 5: remote
bind = SUPER, Z, workspace, 6 bind = SUPER, R, workspace, 5
bind = SUPER SHIFT, Z, moveworkspacetomonitor, 6 current bind = SUPER SHIFT, R, moveworkspacetomonitor, 5 current
bind = SUPER SHIFT, Z, workspace, 6 bind = SUPER SHIFT, R, workspace, 5
windowrule = workspace 6,(thunderbird) windowrule = workspace 5,(Nxplayer.bin)
# 7: remote
bind = SUPER, R, workspace, 7
bind = SUPER SHIFT, R, moveworkspacetomonitor, 7 current
bind = SUPER SHIFT, R, workspace, 7
windowrule = workspace 7,(Nxplayer.bin)
windowrule = float,(Nxplayer.bin) windowrule = float,(Nxplayer.bin)
windowrule = center,(Nxplayer.bin) windowrule = center,(Nxplayer.bin)
# 8: steam
bind = SUPER, S, workspace, 8
bind = SUPER SHIFT, S, moveworkspacetomonitor, 8 current
bind = SUPER SHIFT, S, workspace, 8
windowrule = workspace 8,^(steam).*
windowrule = workspace 8,(.gamescope-wrapped)
# 9: misc
bind = SUPER, X, workspace, 9
bind = SUPER SHIFT, X, moveworkspacetomonitor, 9 current
bind = SUPER SHIFT, X, workspace, 9
bind = SUPER, period, workspace, m+1 bind = SUPER, period, workspace, m+1
bind = SUPER SHIFT, period, movetoworkspace, r+1 bind = SUPER SHIFT, period, movetoworkspace, r+1
bind = SUPER, comma, workspace, m-1 bind = SUPER, comma, workspace, m-1

12
home/hyprland/waybar/modules/wlr_workspaces.nix
View file

@ -5,14 +5,10 @@
format = "{name}:{icon}"; format = "{name}:{icon}";
format-icons = { format-icons = {
"1" = "󰟀"; "1" = "󰟀";
"2" = "󰅴"; "2" = "󰖟";
"3" = "󰈹"; "3" = "󰝰";
"4" = "󰝰"; "4" = "󰭹";
"5" = "󰭹"; "5" = "󰢹";
"6" = "󰇮";
"7" = "󰢹";
"8" = "󰓓";
"9" = "󰣙";
urgent = "󱈸"; urgent = "󱈸";
}; };
sort-by-number = true; sort-by-number = true;