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

Compare commits

base: moritz:e8229815424d84b6c532d5bb25f2c70c2534d786
Branches Tags
moritz:nixos
..
compare: moritz:0e1f606a919c6301471e034e9b7a320b9eb6651f
Branches Tags
moritz:nixos

No commits in common. "e8229815424d84b6c532d5bb25f2c70c2534d786" and "0e1f606a919c6301471e034e9b7a320b9eb6651f" have entirely different histories.
e822981542 ... 0e1f606a91

6 changed files with 46 additions and 77 deletions
Show stats Expand all files Collapse all files

95
flake.lock
View file

@ -61,11 +61,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1672567750, "lastModified": 1672110422,
"narHash": "sha256-Hz1b1TUJbzuLj0eR+LTSUqoGR2gkQdrm3uxru+0rVuY=", "narHash": "sha256-IYR6XGwmgORfSIZYYywZmtRBoWROBjI5rZjgYmQGPJ4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "524c884484c312b76cb4bc9fbf37eec66e2f8406", "rev": "06d88ea2a783a7c563ce57e62d794313ae1e4855",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1672349765, "lastModified": 1671966569,
"narHash": "sha256-Ul3lSGglgHXhgU3YNqsNeTlRH1pqxbR64h+2hM+HtnM=", "narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "dd99675ee81fef051809bc87d67eb07f5ba022e8", "rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -230,37 +230,19 @@
"type": "sourcehut" "type": "sourcehut"
} }
}, },
"hypr-contrib": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1672071700,
"narHash": "sha256-Z0pbBVtijv4xbL42rPzMoYFSOqALFRYDMN9iOumSEso=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "37c8121f98d76f57caa00dd7106877876e0d7483",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "contrib",
"type": "github"
}
},
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"wlroots": "wlroots", "wlroots": "wlroots",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1672510982, "lastModified": 1672057622,
"narHash": "sha256-fxpb2GM2Zi4DU119b7c1g8RN/jF7WXD5UcjXN7lxPJ8=", "narHash": "sha256-UCA9ObYOGpZh5cZi9HO0p35RJVD1i2DT/Djgyx1dOPM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "7525818097f92a99b2b8d02ea43bd0f8ccabd51c", "rev": "545e63d1dd14c76e9faad7839ad255dc9ead4cd8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -303,14 +285,14 @@
}, },
"hyprpaper": { "hyprpaper": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1672266418, "lastModified": 1671404096,
"narHash": "sha256-Xxooxjoymgl65dIMtcBB4/bZx0OcqPZ52G/fw4rozYE=", "narHash": "sha256-ls8i+lXweg0udqbd9XuF/ag+rqDSy/i05B6RrMW2BAI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "aefd63876d0353e4b25e473708903e6c30054931", "rev": "60013ee65566ec7601c367829da2560d7b8638fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -321,11 +303,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1672582743, "lastModified": 1672128529,
"narHash": "sha256-BcHOaoxnUL+DzjGZV+vm8rIDGOFL6DvbPxeCLvzDrN0=", "narHash": "sha256-VBMP7GZ4lUgEyFJUPu+emFn58kqDXthJRi5zwdBu+cw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3d9c0b6bdb5d6ee7126b6362167550c74590d612", "rev": "813159a4264a1cacd2a0ebed863ac3b041f1ebb9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +318,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1658161305, "lastModified": 1671722432,
"narHash": "sha256-X/nhnMCa1Wx4YapsspyAs6QYz6T/85FofrI6NpdPDHg=", "narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e4d49de45a3b5dbcb881656b4e3986e666141ea9", "rev": "652e92b8064949a11bc193b90b74cb727f2a1405",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,22 +349,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1671722432,
"narHash": "sha256-ojcZUekIQeOZkHHzR81st7qxX99dB1Eaaq6PU5MNeKc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "652e92b8064949a11bc193b90b74cb727f2a1405",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1658826464, "lastModified": 1658826464,
"narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=", "narHash": "sha256-94ZTF0uIX/iZdiD4RJ5f933ak/OM4XLl7hF+gCa4Iuk=",
@ -398,13 +364,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1672428209, "lastModified": 1672057183,
"narHash": "sha256-eejhqkDz2cb2vc5VeaWphJz8UXNuoNoM8/Op8eWv2tQ=", "narHash": "sha256-GN7/10DNNvs1FPj9tlZA2qgNdFuYKKuS3qlHTqAxasQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "293a28df6d7ff3dec1e61e37cc4ee6e6c0fb0847", "rev": "b139e44d78c36c69bcbb825b20dbfa51e7738347",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,7 +380,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1671271357, "lastModified": 1671271357,
"narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=",
@ -460,7 +426,7 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
@ -486,11 +452,10 @@
"forgit-git": "forgit-git", "forgit-git": "forgit-git",
"home-manager": "home-manager", "home-manager": "home-manager",
"howdy": "howdy", "howdy": "howdy",
"hypr-contrib": "hypr-contrib",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
"master": "master", "master": "master",
"nixpkgs": "nixpkgs_4", "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"
@ -498,11 +463,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1672353432, "lastModified": 1671883564,
"narHash": "sha256-oZfgp/44/o2tWiylV30cR+DLyWTJ+5dhsdWZVpzs3e4=", "narHash": "sha256-C15oAtyupmLB3coZY7qzEHXjhtUx/+77olVdqVMruAg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "913a47cd064cc06440ea84e5e0452039a85781f0", "rev": "dac57a4eccf1442e8bf4030df6fcbb55883cb682",
"type": "github" "type": "github"
}, },
"original": { "original": {

7
flake.nix
View file

@ -51,11 +51,9 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Hyprland
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";
hyprpaper.url = "github:hyprwm/hyprpaper"; hyprpaper.url = "github:hyprwm/hyprpaper";
hypr-contrib.url = "github:hyprwm/contrib";
}; };
outputs = outputs =
@ -74,14 +72,13 @@
overlay = import ./overlays { inherit inputs; }; overlay = import ./overlays { inherit inputs; };
channels.nixpkgs.overlaysBuilder = channels: [ channels.nixpkgs.overlaysBuilder = channels: [
self.overlay
inputs.agenix.overlay inputs.agenix.overlay
inputs.emacs-overlay.overlay inputs.emacs-overlay.overlay
inputs.howdy.overlays.default inputs.howdy.overlays.default
inputs.hypr-contrib.overlays.default
inputs.hyprland.overlays.default inputs.hyprland.overlays.default
inputs.hyprpaper.overlays.default inputs.hyprpaper.overlays.default
inputs.utils.overlay inputs.utils.overlay
self.overlay
]; ];
# overlays = utils.lib.exportOverlays { # overlays = utils.lib.exportOverlays {

6
modules/profiles/base.nix
View file

@ -39,9 +39,9 @@ with lib;
rm = "rm -i"; rm = "rm -i";
mv = "mv -i"; mv = "mv -i";
nixos-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles"; nix-switch = "sudo nixos-rebuild switch --flake ~/.dotfiles";
nixos-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles"; nix-boot = "sudo nixos-rebuild boot --flake ~/.dotfiles";
nixos-update = "pushd ~/.dotfiles && nix flake update && popd"; nix-lock = "pushd ~/.dotfiles && nix flake update && popd";
latexwatch = ''find -type f -name "*.tex" | entr -c latexmk -pdf -silent''; latexwatch = ''find -type f -name "*.tex" | entr -c latexmk -pdf -silent'';
}; };

11
modules/programs/hyprland/config.nix
View file

@ -18,8 +18,15 @@ in
# See https://wiki.hyprland.org/Configuring/Monitors/ # See https://wiki.hyprland.org/Configuring/Monitors/
monitor=,preferred,auto,1 monitor=,preferred,auto,1
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Execute your favorite apps at launch
# exec-once = waybar & hyprpaper & firefox
# Source a file (multi-file configs)
# source = ~/.config/hypr/myColors.conf
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
input { input {
kb_layout = de,us kb_layout = de,us
@ -133,8 +140,8 @@ in
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 -x11 -show combi bind = $mainMod, R, exec, rofi -show combi -normal-window
bind = $mainMod, C, exec, rofi -x11 -show calc -modi calc -no-show-match -no-sort | wl-copy 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
bind = $mainMod, T, togglesplit, # dwindle bind = $mainMod, T, togglesplit, # dwindle

4
modules/programs/hyprland/default.nix
View file

@ -109,8 +109,8 @@ in
pamixer pamixer
playerctl playerctl
brightnessctl brightnessctl
grimblast slurp
wl-clipboard grim
]; ];
security.pam.services.swaylock = { }; security.pam.services.swaylock = { };

BIN
secrets/ssh-home.age
View file

Binary file not shown.