moritz
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: moritz:1b536e52b5381c1445c409eed86f6ed03a03580e
Branches Tags
moritz:nixos
..
compare: moritz:0e1f606a919c6301471e034e9b7a320b9eb6651f
Branches Tags
moritz:nixos

9 Commits
1b536e52b5 ... 0e1f606a91

Author SHA1 Message Date
Moritz Böhme 0e1f606a91
update inputs 2022-12-30 19:02:02 +01:00
Moritz Böhme 5ffc37cb3f
expand private ssh conf 2022-12-30 19:01:50 +01:00
Moritz Böhme 7c90839817
improve hyprland module 2022-12-30 19:01:31 +01:00
Moritz Böhme fc1084b0ca
improve code quality 2022-12-30 18:58:13 +01:00
Moritz Böhme 8e70a05d6d
update inputs 2022-12-23 12:40:47 +01:00
Moritz Böhme 050d6d90c1
minor changes 2022-12-23 12:40:37 +01:00
Moritz Böhme a856565ac9
update hyprland conf 2022-12-23 12:40:15 +01:00
Moritz Böhme 8470cbe182
update emacs for custom emacs init 2022-12-23 12:39:07 +01:00
Moritz Böhme 6b925636cc
add logseq wrapped for wayland 2022-12-23 12:37:57 +01:00
12 changed files with 264 additions and 136 deletions
Show Stats Expand all files Collapse all files

177
flake.lock
View File

@ -23,11 +23,11 @@
"arkenfox-userjs": { "arkenfox-userjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1669146650, "lastModified": 1670682948,
"narHash": "sha256-9FCZt15lrL/aeDaUBFh+U2A4PlTj0jUKbjUbGIFUBik=", "narHash": "sha256-yFg8U4D+qD9UQXhpAXrl9Ksj16zrCLOgahMtT9QS2Y8=",
"owner": "arkenfox", "owner": "arkenfox",
"repo": "user.js", "repo": "user.js",
"rev": "6789dc7fefac5594d958a065463b4dc9d265c089", "rev": "7135907b2fe13fa55eb8ebf162603037f83e353c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1669439968, "lastModified": 1672110422,
"narHash": "sha256-VlQsxaHruFN29FOvRHUYecySRU9UzFqqpshfgoGxKes=", "narHash": "sha256-IYR6XGwmgORfSIZYYywZmtRBoWROBjI5rZjgYmQGPJ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "838bd1e55d9168d2df9dc0331565f884c3be3250", "rev": "06d88ea2a783a7c563ce57e62d794313ae1e4855",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -153,11 +153,11 @@
"forgit-git": { "forgit-git": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1669300261, "lastModified": 1671476278,
"narHash": "sha256-ca7EM/F0Spsdr3MbjIVwbjLVXg6/qWGczBQHLCcpU5A=", "narHash": "sha256-guAjxFhtybbRyRRXDELDHrM2Xzmi96wPxD2nhL9Ifmk=",
"owner": "wfxr", "owner": "wfxr",
"repo": "forgit", "repo": "forgit",
"rev": "98321ef05a10fe1b536ae88e283339e769866e24", "rev": "ffda73bac3a435a9bbc6f29f2fd98517fbe5d9db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1669328018, "lastModified": 1671966569,
"narHash": "sha256-aJRMobnNDEXKwoSZFS4hGjGU1WDNxkQ82BVKAEohOfY=", "narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "62cb5bcf93896e4dd6b4507dac7ba2e2e3abc9d7", "rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -232,15 +232,17 @@
}, },
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"wlroots": "wlroots" "wlroots": "wlroots",
"xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1669420836, "lastModified": 1672057622,
"narHash": "sha256-5d6hfIs3Rxs2au79yI6JED0/nkqot8NLBgrrZLX+yVk=", "narHash": "sha256-UCA9ObYOGpZh5cZi9HO0p35RJVD1i2DT/Djgyx1dOPM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "f45ec2497735851cd3d361278abaa7e58ec08b2a", "rev": "545e63d1dd14c76e9faad7839ad255dc9ead4cd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -249,13 +251,63 @@
"type": "github" "type": "github"
} }
}, },
"hyprland-protocols": {
"flake": false,
"locked": {
"lastModified": 1670703428,
"narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprland-protocols_2": {
"flake": false,
"locked": {
"lastModified": 1670703428,
"narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-protocols",
"type": "github"
}
},
"hyprpaper": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1671404096,
"narHash": "sha256-ls8i+lXweg0udqbd9XuF/ag+rqDSy/i05B6RrMW2BAI=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "60013ee65566ec7601c367829da2560d7b8638fa",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprpaper",
"type": "github"
}
},
"master": { "master": {
"locked": { "locked": {
"lastModified": 1669458704, "lastModified": 1672128529,
"narHash": "sha256-wpaBMBfjSDCnw4F7A1xBdqy2nW7dvjk3coISy+tTmX4=", "narHash": "sha256-VBMP7GZ4lUgEyFJUPu+emFn58kqDXthJRi5zwdBu+cw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3200a569242cdc75c191fc28b6adefe60315e921", "rev": "813159a4264a1cacd2a0ebed863ac3b041f1ebb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -266,11 +318,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1668765800, "lastModified": 1671722432,
"narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", "rev": "652e92b8064949a11bc193b90b74cb727f2a1405",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -282,11 +334,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1668984258, "lastModified": 1671271954,
"narHash": "sha256-0gDMJ2T3qf58xgcSbYoXiRGUkPWmKyr5C3vcathWhKs=", "narHash": "sha256-cSvu+bnvN08sOlTBWbBrKaBHQZq8mvk8bgpt0ZJ2Snc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cf63ade6f74bbc9d2a017290f1b2e33e8fbfa70a", "rev": "d513b448cc2a6da2c8803e3c197c9fc7e67b19e3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,11 +350,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1669387357, "lastModified": 1658826464,
"narHash": "sha256-z1azVj/5Em5kGhh9OgBOsjTEgMab7hXL/aRilH9tzyI=", "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ce49cb7792a7ffd65ef352dda1110a4e4a204eac",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1672057183,
"narHash": "sha256-GN7/10DNNvs1FPj9tlZA2qgNdFuYKKuS3qlHTqAxasQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "55b3f68bda6d4f4dc6092eed0508063f154fa4fd", "rev": "b139e44d78c36c69bcbb825b20dbfa51e7738347",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -312,13 +380,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1668994630, "lastModified": 1671271357,
"narHash": "sha256-1lqx6HLyw6fMNX/hXrrETG1vMvZRGm2XVC9O/Jt0T6c=", "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "af50806f7c6ab40df3e6b239099e8f8385f6c78b", "rev": "40f79f003b6377bd2f4ed4027dde1f8f922995dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -358,15 +426,15 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1669152228, "lastModified": 1672050129,
"narHash": "sha256-FEDReoTLWJHXcNso7aaAlAUU7uOqIR6Hc/C/nqlfooE=", "narHash": "sha256-GBQMcvJUSwAVOpDjVKzB6D5mmHI7Y4nFw+04bnS9QrM=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "078b0dee35e2da01334af682ec347463b70a9986", "rev": "67d98f02443b9928bc77f1267741dcfdd3d7b65c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,8 +453,9 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"howdy": "howdy", "howdy": "howdy",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprpaper": "hyprpaper",
"master": "master", "master": "master",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"pre-commit-hooks": "pre-commit-hooks_2", "pre-commit-hooks": "pre-commit-hooks_2",
"stable": "stable", "stable": "stable",
"utils": "utils_2" "utils": "utils_2"
@ -394,11 +463,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1669379897, "lastModified": 1671883564,
"narHash": "sha256-XM3xBfQD5tOtV4KAhQHyh53cJdqkLwotZa5JJIUjbQc=", "narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8690906c4d80db5d85f52313a8487bf2e7b8d4c5", "rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -445,11 +514,11 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1668785720, "lastModified": 1671723353,
"narHash": "sha256-CX+PYJP2PxZWL380WzyMNsrfRgIb/78brdwvDg/zj28=", "narHash": "sha256-G1jiI0SA7eiZusO+iJytErMRNbKbwqJJJGL+sNoBNoQ=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "4ff46e6cf9463e594605928feeb7c55cf323b5e7", "rev": "b28a9afd4b0b86e9a66a40f6b44b69f59947b7d6",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -458,6 +527,28 @@
"repo": "wlroots", "repo": "wlroots",
"type": "gitlab" "type": "gitlab"
} }
},
"xdph": {
"inputs": {
"hyprland-protocols": "hyprland-protocols_2",
"nixpkgs": [
"hyprland",
"nixpkgs"
]
},
"locked": {
"lastModified": 1671837878,
"narHash": "sha256-OmFDyktTc/l+3wHboHeFpAQgPt3r7jjqZf8MrwuUGMo=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "e47f4cec698080768821b271510985ab94a37e91",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

23
flake.nix
View File

@ -52,6 +52,8 @@
}; };
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
hyprpaper.url = "github:hyprwm/hyprpaper";
}; };
outputs = outputs =
@ -59,20 +61,32 @@
utils.lib.mkFlake { utils.lib.mkFlake {
inherit self inputs; inherit self inputs;
supportedSystems = [ "x86_64-linux" ];
channelsConfig.allowUnfree = true; channelsConfig.allowUnfree = true;
################ ################
### Overlays ### ### Overlays ###
################ ################
overlays.default = import ./overlays { inherit inputs; }; overlay = import ./overlays { inherit inputs; };
channels.nixpkgs.overlaysBuilder = channels: [ channels.nixpkgs.overlaysBuilder = channels: [
self.overlays.default self.overlay
inputs.utils.overlay inputs.agenix.overlay
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
inputs.howdy.overlays.default inputs.howdy.overlays.default
inputs.hyprland.overlays.default
inputs.hyprpaper.overlays.default
inputs.utils.overlay
]; ];
# overlays = utils.lib.exportOverlays {
# inherit (self) pkgs inputs;
# };
overlays.default = self.overlay;
############### ###############
### Modules ### ### Modules ###
############### ###############
@ -105,6 +119,7 @@
self.nixosModules.gaming self.nixosModules.gaming
]; ];
hosts.nixos-desktop.modules = [ hosts.nixos-desktop.modules = [
./hosts/nixos-desktop ./hosts/nixos-desktop
self.nixosModules.desktop self.nixosModules.desktop
@ -136,6 +151,8 @@
shellcheck.enable = true; shellcheck.enable = true;
}; };
}; };
packages = utils.lib.exportPackages self.overlays channels;
}; };
}; };
} }

3
modules/profiles/base.nix
View File

@ -93,6 +93,7 @@ with lib;
hut hut
lazygit lazygit
neofetch neofetch
ripgrep
tmux tmux
ttyper ttyper
up up
@ -102,7 +103,7 @@ with lib;
fonts.fonts = with pkgs; [ fonts.fonts = with pkgs; [
(nerdfonts.override { (nerdfonts.override {
fonts = [ "FiraCode" "DroidSansMono" "JetBrainsMono" ]; fonts = [ "FiraCode" ];
}) })
]; ];

8
modules/profiles/desktop.nix
View File

@ -95,7 +95,6 @@ with lib; {
mullvad.enable = true; mullvad.enable = true;
openconnect.enable = true; openconnect.enable = true;
openvpn.enable = true; openvpn.enable = true;
picom.enable = true;
printing.enable = true; printing.enable = true;
redshift.enable = true; redshift.enable = true;
}; };
@ -122,10 +121,15 @@ with lib; {
vlc vlc
thunderbird thunderbird
plantuml plantuml
jetbrains.pycharm-professional
synology-drive-client
]; ];
programs.chromium.enable = true;
home-manager.users.moritz = { home-manager.users.moritz = {
services.unclutter.enable = true;
services.nextcloud-client = { services.nextcloud-client = {
enable = true; enable = true;
startInBackground = true; startInBackground = true;

1
modules/profiles/gaming.nix
View File

@ -8,5 +8,6 @@
lutris lutris
legendary-gl legendary-gl
heroic heroic
mangohud
]; ];
} }

1
modules/programs/bspwm/default.nix
View File

@ -51,6 +51,7 @@ in
extraConfig = builtins.readFile ./bspwmrc; extraConfig = builtins.readFile ./bspwmrc;
}; };
services = { services = {
unclutter.enable = true;
sxhkd = { sxhkd = {
enable = true; enable = true;
extraConfig = builtins.readFile ./sxhkdrc; extraConfig = builtins.readFile ./sxhkdrc;

67
modules/programs/emacs.nix
View File

@ -8,7 +8,7 @@
with lib; with lib;
let let
cfg = config.my.programs.emacs; cfg = config.my.programs.emacs;
myEmacs = with pkgs; ((emacsPackagesFor emacs).emacsWithPackages myEmacs = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages
(epkgs: [ epkgs.vterm ])); (epkgs: [ epkgs.vterm ]));
in in
{ {
@ -16,72 +16,25 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
my.shell.aliases = { my.shell.aliases = {
emacs = "emacsclient -t -a 'emacs -t'"; emacs = "emacsclient -nw -a 'emacs -nw'";
}; };
fonts.fonts = [ pkgs.emacs-all-the-icons-fonts ]; fonts.fonts = with pkgs; [
environment.systemPackages = with pkgs; [ emacs-all-the-icons-fonts
### Emacs itself (iosevka-bin.override { variant = "aile"; })
binutils # native-comp needs 'as', provided by this ];
users.users.moritz.packages = with pkgs; [
myEmacs myEmacs
### Doom dependencies
git
(ripgrep.override { withPCRE2 = true; }) (ripgrep.override { withPCRE2 = true; })
gnutls # for TLS connectivity # flyspell
### Optional dependencies
fd # faster projectile indexing
imagemagick # for image-dired
zstd # for undo-fu-session/undo-tree compression
### Module dependencies
## :checkers
# spell
(hunspellWithDicts [ (hunspellWithDicts [
hunspellDicts.en_GB-ize hunspellDicts.en_GB-ize
hunspellDicts.en_US hunspellDicts.en_US
hunspellDicts.de_DE hunspellDicts.de_DE
]) ])
# grammar # language servers
languagetool nil
## : tools
# lookup & org +roam
sqlite
gcc # HACK to get emacsqlite binary
wordnet
graphviz
## :lang
# latex & org (latex previews)
texlive.combined.scheme-full
texlab
# nix
nixfmt # for formating nix
rnix-lsp
# markdown & org +pandoc
pandoc
# python
nodePackages.pyright
# sh
nodePackages.bash-language-server
## :email
# mu4e
mu
isync
## :app
# everywhere
xdotool
xorg.xwininfo
xclip
xorg.xprop
]; ];
home-manager.users.moritz = { home-manager.users.moritz = {
home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ]; home.sessionPath = [ "/home/moritz/.config/emacs/bin/" ];

44
modules/programs/hyprland/config.nix
View File

@ -3,6 +3,12 @@
, pkgs , pkgs
, ... , ...
}: }:
with lib;
let
mkRule = rule: windowRegexes: "windowrulev2 = ${rule},${concatStringsSep "," windowRegexes}";
mkRules = rules: windowRegexes: concatStringsSep "\n" (map (flip mkRule windowRegexes) rules);
in
'' ''
# #
# Please note not all available settings / options are set here. # Please note not all available settings / options are set here.
@ -26,7 +32,7 @@
kb_layout = de,us kb_layout = de,us
kb_variant = kb_variant =
kb_model = kb_model =
kb_options = grp:alt_shift_toggle kb_options = grp:win_space_toggle,caps:escape
kb_rules = kb_rules =
follow_mouse = 1 follow_mouse = 1
@ -47,29 +53,31 @@
col.active_border = rgba(1affffee) col.active_border = rgba(1affffee)
col.inactive_border = rgba(595959aa) col.inactive_border = rgba(595959aa)
cursor_inactive_timeout = 1
layout = dwindle layout = dwindle
} }
decoration { decoration {
# See https://wiki.hyprland.org/Configuring/Variables/ for more # See https://wiki.hyprland.org/Configuring/Variables/ for more
rounding = 5 rounding = 3
inactive_opacity = 0.98
blur = yes blur = yes
blur_size = 8 blur_size = 3
blur_passes = 1 blur_passes = 3
blur_new_optimizations = on blur_new_optimizations = on
drop_shadow = yes drop_shadow = yes
shadow_range = 4 shadow_range = 10
shadow_render_power = 3 shadow_render_power = 2
col.shadow = rgba(1a1a1aee)
# col.shadow = rgba(1a1a1aee)
} }
animations { animations {
enabled = yes enabled = yes
# Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more # Some default Lanimations, see https://wiki.hyprland.org/Configuring/Animations/ for more
bezier = myBezier, 0.45, 0, 0.55, 1 bezier = myBezier, 0.45, 0, 0.55, 1
@ -90,6 +98,7 @@
master { master {
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
no_gaps_when_only = true no_gaps_when_only = true
new_is_master = false
} }
gestures { gestures {
@ -103,13 +112,21 @@
sensitivity = -0.5 sensitivity = -0.5
} }
# Example windowrule v1
# windowrule = float, ^(kitty)$
# Example windowrule v2 # Example windowrule v2
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
windowrulev2 = float,class:^([rR]ofi)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
# Firefox Sharing Indicator
${mkRules ["float" "move 49% 40" "noborder"] ["title:^(.*Sharing Indicator)$"]}
# Rofi
${mkRules ["float" "opacity 0.95 0.95"] ["class:^([rR]ofi)$"]}
windowrulev2 = opacity 0.95 0.95,floating:1
# Games
# ${mkRules ["opaque" "noblur" "noborder" "noshadow" "forceinput"] ["fullscreen:1"]}
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
$mainMod = SUPER $mainMod = SUPER
@ -119,10 +136,11 @@
bind = $mainMod, D, exec, hyprctl keyword general:layout dwindle bind = $mainMod, D, exec, hyprctl keyword general:layout dwindle
bind = $mainMod, E, exec, emacsclient -c -a emacs bind = $mainMod, E, exec, emacsclient -c -a emacs
bind = $mainMod, F, togglefloating, bind = $mainMod, F, togglefloating,
bind = $mainMod SHIFT, F, fullscreen,
bind = $mainMod, M, exec, hyprctl keyword general:layout master bind = $mainMod, M, exec, hyprctl keyword general:layout master
bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, P, pseudo, # dwindle
bind = $mainMod, Q, killactive, bind = $mainMod, Q, killactive,
bind = $mainMod, R, exec, rofi -show combi bind = $mainMod, R, exec, rofi -show combi -normal-window
bind = $mainMod, C, exec, rofi -show calc -modi calc -no-show-match -no-sort | xclip -selection clipboard bind = $mainMod, C, exec, rofi -show calc -modi calc -no-show-match -no-sort | xclip -selection clipboard
bind = $mainMod, B, exec, rofi-bluetooth bind = $mainMod, B, exec, rofi-bluetooth
bind = $mainMod, RETURN, exec, kitty bind = $mainMod, RETURN, exec, kitty

60
modules/programs/hyprland/default.nix
View File

@ -9,9 +9,7 @@ with lib;
let let
cfg = config.my.programs.hyprland; cfg = config.my.programs.hyprland;
hyprland-default = inputs.hyprland.packages.${pkgs.system}.default; hyprland = pkgs.hyprland.override { nvidiaPatches = cfg.nvidiaSupport; };
hyprland-nvidia = hyprland-default.override { nvidiaPatches = true; };
hyprland = if cfg.nvidiaSupport then hyprland-nvidia else hyprland-default;
in in
{ {
options.my.programs.hyprland = { options.my.programs.hyprland = {
@ -26,7 +24,10 @@ in
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = pkgs.waybar-hyprland; package = pkgs.waybar-hyprland;
systemd.enable = true; systemd = {
enable = true;
target = "hyprland-session.target";
};
settings = { settings = {
mainBar = { mainBar = {
layer = "top"; layer = "top";
@ -79,9 +80,27 @@ in
} }
]; ];
}; };
# start swayidle as part of hyprland, not sway # start swayidle as part of hyprland, not sway
systemd.user.services.swayidle.Install.WantedBy = lib.mkForce [ "hyprland-session.target" ]; systemd.user.services.swayidle.Install.WantedBy = lib.mkForce [ "hyprland-session.target" ];
xdg.configFile."hypr/hyprpaper.conf" = {
text =
let
setWallpaper = wallpaper: ''
preload = ${wallpaper}
wallpaper = ,${wallpaper}
'';
in
setWallpaper "/home/moritz/.config/wallpapers/a_short_walk.png";
onChange = "${pkgs.systemd}/bin/systemctl restart --user hyprpaper.service";
};
};
systemd.user.services.hyprpaper = {
enable = true;
path = [ pkgs.hyprpaper ];
wantedBy = [ "hyprland-session.target" ];
after = [ "display-manager.service" ];
script = "hyprpaper";
}; };
users.users.moritz.packages = with pkgs; [ users.users.moritz.packages = with pkgs; [
@ -90,6 +109,8 @@ in
pamixer pamixer
playerctl playerctl
brightnessctl brightnessctl
slurp
grim
]; ];
security.pam.services.swaylock = { }; security.pam.services.swaylock = { };
@ -120,22 +141,33 @@ in
__GL_VRR_ALLOWED = "0"; __GL_VRR_ALLOWED = "0";
} else { }); } else { });
services.xserver = { services = {
enable = true; dbus.enable = true;
displayManager = { pipewire = {
gdm.enable = true; enable = true;
autoLogin = { alsa.enable = true;
enable = true; alsa.support32Bit = true;
user = "moritz"; pulse.enable = true;
};
xserver = {
enable = true;
displayManager = {
gdm.enable = true;
autoLogin = {
enable = true;
user = "moritz";
};
defaultSession = "hyprland";
sessionPackages = [ hyprland ];
}; };
defaultSession = "hyprland";
sessionPackages = [ hyprland ];
}; };
}; };
security.rtkit.enable = true;
xdg.portal = { xdg.portal = {
enable = true; enable = true;
wlr.enable = true; wlr.enable = true;
extraPortals = [ pkgs.xdg-desktop-portal-hyprland ];
}; };
}; };
} }

2
modules/programs/logseq.nix
View File

@ -13,7 +13,7 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
users.users.moritz.packages = with pkgs; [ users.users.moritz.packages = with pkgs; [
logseq logseq-wayland
]; ];
xdg.mime.defaultApplications."x-scheme-handler/logseq" = "logseq.desktop"; xdg.mime.defaultApplications."x-scheme-handler/logseq" = "logseq.desktop";
}; };

14
overlays/default.nix
View File

@ -1,12 +1,22 @@
{ inputs }: final: prev: { { inputs }: final: prev: {
nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}"; logseq-wayland = prev.symlinkJoin {
agenix = inputs.agenix.defaultPackage."${prev.system}"; name = "logseq-wayland";
paths = [ prev.logseq ];
nativeBuildInputs = [ prev.makeWrapper ];
postBuild = ''
wrapProgram $out/bin/logseq \
--add-flags "--socket=wayland --enable-features=UseOzonePlatform --ozone-platform=wayland"
'';
};
waybar-hyprland = prev.waybar.overrideAttrs (old: { waybar-hyprland = prev.waybar.overrideAttrs (old: {
pname = "${old.pname}-hyprland";
postPatch = old.postPatch or "" + '' postPatch = old.postPatch or "" + ''
sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp
''; '';
mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ]; mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ];
}); });
master = import inputs.master { master = import inputs.master {
inherit (prev) system; inherit (prev) system;
config.allowUnfree = true; config.allowUnfree = true;

BIN
secrets/ssh-home.age
View File

Binary file not shown.