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

Compare commits

base: moritz:badc4ffa499c01e9db76b0217958733ea260e370
Branches Tags
moritz:nixos
..
compare: moritz:5cffc8c06cdca81150ec553969480cf51c1dc32c
Branches Tags
moritz:nixos

8 Commits
badc4ffa49 ... 5cffc8c06c

Author SHA1 Message Date
Moritz Böhme 5cffc8c06c
refactor(programs): sort imports 2023-04-16 18:01:00 +02:00
Moritz Böhme 8d5481949e
fix(nvim): org configuration 2023-04-16 18:00:05 +02:00
Moritz Böhme bd9bbdda10
feat(hyprland): decrease gap size 2023-04-16 17:59:21 +02:00
Moritz Böhme eca0d4ddb2
build: update inputs 2023-04-16 17:57:53 +02:00
Moritz Böhme 55c17db428
refactor(profiles)!: split up desktop profile 2023-04-16 17:56:43 +02:00
Moritz Böhme 48c2b30e18
feat(nvim): use latest version of bufferline.nvim 2023-04-16 17:54:44 +02:00
Moritz Böhme a8c51c376c
feat: add chromium module 2023-04-16 17:53:50 +02:00
Moritz Böhme 58f6391273
refactor(nvim): use nix-community nightly neovim 2023-04-16 17:51:28 +02:00
14 changed files with 283 additions and 190 deletions
Show Stats Expand all files Collapse all files

166
flake.lock
View File

@ -69,11 +69,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1680646146, "lastModified": 1681335578,
"narHash": "sha256-NH+EhLFYDwLQ01BqfTwGvZAjfmZynnP1xxPjqH0XJss=", "narHash": "sha256-yIZqE6WpkgAllsJ7IAbn8k6IRz/0CS/xp6IR+8yrEP8=",
"owner": "zhaofengli", "owner": "zhaofengli",
"repo": "attic", "repo": "attic",
"rev": "efa15b9788add910f6e8409dddfb7bb69c2ad201", "rev": "171c89fbe0f099e8bf6e466a1a1a12578f703f0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -82,6 +82,22 @@
"type": "github" "type": "github"
} }
}, },
"bufferline-nvim": {
"flake": false,
"locked": {
"lastModified": 1681547098,
"narHash": "sha256-WZAJiDm77rS9S4tN7dz03jjnv1jFvTur6dLg8OkYVM4=",
"owner": "akinsho",
"repo": "bufferline.nvim",
"rev": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf",
"type": "github"
},
"original": {
"owner": "akinsho",
"repo": "bufferline.nvim",
"type": "github"
}
},
"comment-box-nvim": { "comment-box-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -101,11 +117,11 @@
"copilot-lua": { "copilot-lua": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1680027228, "lastModified": 1681223911,
"narHash": "sha256-3u+2azMRm24mp5iOrxwYg9QrM2xJHnSjGsldIDRS6HQ=", "narHash": "sha256-ttF9LW6PNKk/BBWET2BUqtq5f7OIZ7ohtQevAaP8srg=",
"owner": "zbirenbaum", "owner": "zbirenbaum",
"repo": "copilot.lua", "repo": "copilot.lua",
"rev": "f0b41fb89ef2ed7ab4e8cd5208a30755aa638fc4", "rev": "a4a37dda9e48986e5d2a90d6a3cbc88fca241dbb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,16 +214,32 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1673956053,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1681037374, "lastModified": 1681202837,
"narHash": "sha256-XL6X3VGbEFJZDUouv2xpKg2Aljzu/etPLv5e1FPt1q0=", "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "033b9f258ca96a10e543d4442071f614dc3f8412", "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,17 +319,14 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
],
"utils": [
"flake-utils"
] ]
}, },
"locked": { "locked": {
"lastModified": 1680667162, "lastModified": 1681586243,
"narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=", "narHash": "sha256-vdP79IZuDZVNSl4RN1LgEuab1Tkbv4gCxiE8VLdRf7U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d", "rev": "40ebb62101c83de81e5fd7c3cfe5cea2ed21b1ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -332,11 +361,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1681066980, "lastModified": 1681652918,
"narHash": "sha256-68e+4txZITxbHP9IPYfLm36kOoI+rkMjRCbrPgtdQK8=", "narHash": "sha256-ybXmD3OhyMG1Yz31lxT8de7aBi2mQmXmzAZ7q49Uvi4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "f3909cf2bfdd72aff69112f18c920ac6c9ca28f1", "rev": "b05ff89c76b2c9454c76daf2120f4ccb076a018d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,11 +400,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1681080114, "lastModified": 1681650457,
"narHash": "sha256-rAKfgQJQRsw4QMOXdxfHIh/d5LPY6HHKBX1KtaPs2No=", "narHash": "sha256-IGXRZrFGFqUeM5iDgP/ojbrd+gKL40PaFFAITxbkfZ0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprpaper", "repo": "hyprpaper",
"rev": "4bcedde1dc1a06107ec32c93a937de30f40aa1fc", "rev": "3bfaac09f58ce31c33e1a56e7eaa606a87fe4c32",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,11 +416,11 @@
"lspsaga-nvim": { "lspsaga-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1681041449, "lastModified": 1681470671,
"narHash": "sha256-ARbFiwfWsYapFH5p7xSCCe25RFUlUI/h8Jv81XHLBx4=", "narHash": "sha256-mekeKttJSsBpTxMShC0l29/Wx3VKUnHMh6YtLYtx9Lk=",
"owner": "glepnir", "owner": "glepnir",
"repo": "lspsaga.nvim", "repo": "lspsaga.nvim",
"rev": "1fbb3e4721354d0d0a20a28bb77b3f83fe68538b", "rev": "b2feb95e84776f7c9cdfb96e4c89a582c9ade0e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -402,11 +431,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1681080342, "lastModified": 1681658302,
"narHash": "sha256-7GvJEuGANq9/zk549rf5zoeTyFdsw5irvVLf5crpBnE=", "narHash": "sha256-KDXpkA7JOTnffQWAA5W246FoJNbdSur5HgzYScOzYKQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "340acec509d71d0d0decd7a82e7cb52ae4c76065", "rev": "f30febf83039aaa4a4399d46d068900a2b449de6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -415,25 +444,47 @@
"type": "github" "type": "github"
} }
}, },
"neovim": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_4" "nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1680264322, "lastModified": 1681631972,
"narHash": "sha256-nv1lSK+y/vv6ASMhNFoJE1YcNisJmQ0A+anNLzscvKk=", "narHash": "sha256-zF+sWaQPJpoDyhWXvwJGR7VryYr9+qBCWMTNRjA3BhQ=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "83bfd94d1df5eecb8e4069a227c7d24598636d63", "rev": "0d9b0fbe579343fa6d6c46e6e1bf6bb8719ea5e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"dir": "contrib", "dir": "contrib",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "83bfd94d1df5eecb8e4069a227c7d24598636d63", "type": "github"
}
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat_2",
"neovim-flake": "neovim-flake",
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1681632748,
"narHash": "sha256-c0CskvdpipnTn5TSjq6KqNkeKRPYCDMmVTdZL08HTJA=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "0e3e0029aa6353ecb7304d4a683d8d6ee69379ef",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"type": "github" "type": "github"
} }
}, },
@ -448,11 +499,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1680544266, "lastModified": 1681412802,
"narHash": "sha256-d/TusDXmIo8IT5DNRA21lN+nOVSER8atIx9TJteR6LQ=", "narHash": "sha256-IcEala6vFQ7SFNOPCeXBh9Jbl8nL2QOtLmO7RbDsBbo=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "56a1fa87b98a9508920f4b0ab8fe36d5b54b2362", "rev": "1d5bc81023c21b22cfbea06a8b4b82963c01b941",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,27 +578,27 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1671983799, "lastModified": 1681571934,
"narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", "narHash": "sha256-Q3B3HTqhTahhPCT53ahK1FPktOXlEWmudSttd9CWGbE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", "rev": "29176972b4be60f7d3eb3101f696c99f2e6ada57",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1681028957, "lastModified": 1681633309,
"narHash": "sha256-gKWkKT/nFg2d9HZyK7VAjRzkyPfKLx+uIGyWXDw0NB0=", "narHash": "sha256-HvEzKU/ZWGyIt2G+AIEKmMt/ED3P+Tgjw3/BkArti0o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "11c129c16f4051ad215ea7b0d297a6c7cf5d24d7", "rev": "cb578ff7040066fd1b3f6f087bca796ddbf598b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -559,11 +610,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1678898370, "lastModified": 1681303793,
"narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", "narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ac718d02867a84b42522a0ece52d841188208f2c", "rev": "fe2ecaf706a5907b5e54d979fbde4924d84b65fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -591,18 +642,18 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1680981441, "lastModified": 1681413034,
"narHash": "sha256-Tqr2mCVssUVp1ZXXMpgYs9+ZonaWrZGPGltJz94FYi4=", "narHash": "sha256-/t7OjNQcNkeWeSq/CFLYVBfm+IEnkjoSm9iKvArnUUI=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "2144d9ddcb550d6dce64a2b44facdc8c5ea2e28a", "rev": "d3de8f69ca88fb6f8b09e5b598be5ac98d28ede5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -617,6 +668,7 @@
"arkenfox-userjs": "arkenfox-userjs", "arkenfox-userjs": "arkenfox-userjs",
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver", "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
"attic": "attic", "attic": "attic",
"bufferline-nvim": "bufferline-nvim",
"comment-box-nvim": "comment-box-nvim", "comment-box-nvim": "comment-box-nvim",
"copilot-lua": "copilot-lua", "copilot-lua": "copilot-lua",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -627,7 +679,7 @@
"hyprpaper": "hyprpaper", "hyprpaper": "hyprpaper",
"lspsaga-nvim": "lspsaga-nvim", "lspsaga-nvim": "lspsaga-nvim",
"master": "master", "master": "master",
"neovim": "neovim", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nil": "nil", "nil": "nil",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects", "nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects",
@ -707,11 +759,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1680865339, "lastModified": 1681482634,
"narHash": "sha256-H6rmJ1CyJ3Q5ZyoLMYq/UEYMS9Q1orJjRpWiQ47HudE=", "narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0040164e473509b4aee6aedb3b923e400d6df10b", "rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -786,11 +838,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1681066882, "lastModified": 1681127512,
"narHash": "sha256-8szxuwDOQcYyS8TZokGpIJYzaTwBQ9pmmcCkeuX2YV8=", "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "e48165c5637260cf2a88494a112269922dee58de", "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
flake.nix
View File

@ -25,7 +25,6 @@
attic.url = "github:zhaofengli/attic"; attic.url = "github:zhaofengli/attic";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
home-manager.inputs.utils.follows = "flake-utils";
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager";
nil.inputs.flake-utils.follows = "flake-utils"; nil.inputs.flake-utils.follows = "flake-utils";
@ -35,7 +34,10 @@
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
# Neovim # Neovim
neovim.url = "github:neovim/neovim/83bfd94d1df5eecb8e4069a227c7d24598636d63?dir=contrib"; # HACK to fix neovim not building at the moment neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
bufferline-nvim.flake = false;
bufferline-nvim.url = "github:akinsho/bufferline.nvim";
comment-box-nvim.flake = false; comment-box-nvim.flake = false;
comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim"; comment-box-nvim.url = "github:LudoPinelli/comment-box.nvim";
@ -99,6 +101,7 @@
channels.nixpkgs.overlaysBuilder = _: [ channels.nixpkgs.overlaysBuilder = _: [
inputs.hypr-contrib.overlays.default inputs.hypr-contrib.overlays.default
inputs.hyprland.overlays.default inputs.hyprland.overlays.default
inputs.neovim-nightly-overlay.overlay
inputs.utils.overlay inputs.utils.overlay
self.overlay self.overlay
]; ];
@ -118,6 +121,7 @@
./modules/profiles/base.nix ./modules/profiles/base.nix
./modules/profiles/gaming.nix ./modules/profiles/gaming.nix
./modules/profiles/desktop.nix ./modules/profiles/desktop.nix
./modules/profiles/personal.nix
]; ];
hostDefaults.modules = [ hostDefaults.modules = [
@ -139,6 +143,7 @@
./hosts/nixos-laptop ./hosts/nixos-laptop
self.nixosModules.desktop self.nixosModules.desktop
self.nixosModules.gaming self.nixosModules.gaming
self.nixosModules.personal
]; ];
@ -146,6 +151,7 @@
./hosts/nixos-desktop ./hosts/nixos-desktop
self.nixosModules.desktop self.nixosModules.desktop
self.nixosModules.gaming self.nixosModules.gaming
self.nixosModules.personal
]; ];
/* /*

7
hosts/nixos-desktop/default.nix
View File

@ -10,8 +10,11 @@
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
my = {
my.programs.hyprland.nvidiaSupport = true; programs.hyprland.nvidiaSupport = true;
services.mullvad.enable = true;
programs.ledger.enable = true;
};
# KERNEL # KERNEL
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;

133
modules/profiles/desktop.nix
View File

@ -5,135 +5,56 @@
with lib; { with lib; {
my = { my = {
yubikey = { yubikey = {
enable = true; enable = mkDefault true;
luksSupport = { luksSupport = {
enable = true; enable = mkDefault true;
devices = [ "enc" ]; devices = mkDefault [ "enc" ];
}; };
}; };
wallpapers.enable = true; wallpapers.enable = mkDefault true;
theming = { theming = {
enable = true; enable = mkDefault true;
scheme = "catppuccin-macchiato"; scheme = mkDefault "catppuccin-macchiato";
};
virtualisation = {
podman.enable = true;
libvirtd.enable = true;
}; };
virtualisation.podman.enable = mkDefault true;
programs = { programs = {
adb.enable = true; chromium.enable = mkDefault true;
hyprland.enable = true; firefox.enable = mkDefault true;
code.enable = true; gpg.enable = mkDefault true;
firefox = { hyprland.enable = mkDefault true;
enable = true; logseq.enable = mkDefault true;
arkenfox = { nvim.enable = mkDefault true;
enable = true; python.versions."311".enable = mkDefault true;
overrides = { spotify.enable = mkDefault true;
## arkenfox overrides ssh.enable = mkDefault true;
# automatic search thunar.enable = mkDefault true;
"keyword.enabled" = true; zathura.enable = mkDefault true;
"browser.search.suggest.enabled" = true;
"browser.urlbar.suggest.searches" = true;
# startup page
"browser.startup.homepage" = "https://searxng.moritzboeh.me/";
"browser.startup.page" = 1;
# drm
"media.eme.enabled" = true;
# sanitisation
"privacy.clearOnShutdown.history" = false;
# disable letterboxing
"privacy.resistFingerprinting.letterboxing" = false;
## OTHER
# Dont show warning when accessing about:config
"browser.aboutConfig.showWarning" = false;
# Hide bookmarks
"browser.toolbars.bookmarks.visibility" = "never";
# Smooth scrolling
"general.smoothScroll.lines.durationMaxMS" = 125;
"general.smoothScroll.lines.durationMinMS" = 125;
"general.smoothScroll.mouseWheel.durationMaxMS" = 200;
"general.smoothScroll.mouseWheel.durationMinMS" = 100;
"general.smoothScroll.msdPhysics.enabled" = true;
"general.smoothScroll.other.durationMaxMS" = 125;
"general.smoothScroll.other.durationMinMS" = 125;
"general.smoothScroll.pages.durationMaxMS" = 125;
"general.smoothScroll.pages.durationMinMS" = 125;
"mousewheel.min_line_scroll_amount" = 40;
"mousewheel.system_scroll_override_on_root_content.enabled" = true;
"mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
"mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
"toolkit.scrollbox.horizontalScrollDistance" = 6;
"toolkit.scrollbox.verticalScrollDistance" = 2;
};
};
};
git.signing = true;
gpg.enable = true;
hub.enable = true;
ledger.enable = true;
logseq.enable = true;
nvim.enable = true;
python.versions."311".enable = true;
ssh = {
enable = true;
includeSecrets = [ ../../secrets/ssh-home.age ];
};
spotify.enable = true;
thunar.enable = true;
zathura.enable = true;
}; };
services = { services = {
dunst.enable = true; dunst.enable = mkDefault true;
kdeconnect.enable = true;
mullvad.enable = true;
openconnect.enable = true;
printing.enable = true;
gammastep.enable = true; gammastep.enable = true;
kdeconnect.enable = mkDefault true;
printing.enable = true;
wireguard.enable = true; wireguard.enable = true;
}; };
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# nix
nixpkgs-review
# ripping
abcde
handbrake
picard
# other
anki anki
calibre calibre
jellyfin-media-player
keepassxc keepassxc
stable.libreoffice # HACK to fix build error nixpkgs-review
pavucontrol pavucontrol
stable.libreoffice # HACK to fix build error
stable.signal-desktop stable.signal-desktop
tlaplusToolbox
vlc
thunderbird
plantuml
jetbrains.pycharm-professional
synology-drive-client synology-drive-client
texlive.combined.scheme-full texlive.combined.scheme-full
thunderbird
vlc
]; ];
programs = { programs.nix-ld.enable = true;
chromium.enable = true;
nix-ld.enable = true;
};
home-manager.users.moritz = { home-manager.users.moritz = {
services.nextcloud-client = { services.nextcloud-client = {
@ -148,7 +69,5 @@ with lib; {
alsa.enable = true; alsa.enable = true;
pulse.enable = true; pulse.enable = true;
}; };
# Remap capslock to esc and shift + capslock to capslock
xserver.xkbOptions = "terminate:ctrl_alt_bksp,caps:escape_shifted_capslock";
}; };
} }

60
modules/profiles/personal.nix Normal file
View File

@ -0,0 +1,60 @@
{ lib, ... }:
with lib;
{
my = {
services.openconnect.enable = true;
programs = {
ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
git.signing = mkDefault true;
hub.enable = mkDefault true;
firefox.arkenfox = {
enable = mkDefault true;
overrides = mkDefault {
## arkenfox overrides
# automatic search
"keyword.enabled" = true;
"browser.search.suggest.enabled" = true;
"browser.urlbar.suggest.searches" = true;
# startup page
"browser.startup.homepage" = "https://searxng.moritzboeh.me/";
"browser.startup.page" = 1;
# drm
"media.eme.enabled" = true;
# sanitisation
"privacy.clearOnShutdown.history" = false;
# disable letterboxing
"privacy.resistFingerprinting.letterboxing" = false;
## OTHER
# Dont show warning when accessing about:config
"browser.aboutConfig.showWarning" = false;
# Hide bookmarks
"browser.toolbars.bookmarks.visibility" = "never";
# Smooth scrolling
"general.smoothScroll.lines.durationMaxMS" = 125;
"general.smoothScroll.lines.durationMinMS" = 125;
"general.smoothScroll.mouseWheel.durationMaxMS" = 200;
"general.smoothScroll.mouseWheel.durationMinMS" = 100;
"general.smoothScroll.msdPhysics.enabled" = true;
"general.smoothScroll.other.durationMaxMS" = 125;
"general.smoothScroll.other.durationMinMS" = 125;
"general.smoothScroll.pages.durationMaxMS" = 125;
"general.smoothScroll.pages.durationMinMS" = 125;
"mousewheel.min_line_scroll_amount" = 40;
"mousewheel.system_scroll_override_on_root_content.enabled" = true;
"mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
"mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
"toolkit.scrollbox.horizontalScrollDistance" = 6;
"toolkit.scrollbox.verticalScrollDistance" = 2;
};
};
};
};
}

32
modules/profiles/ripping.nix Normal file
View File

@ -0,0 +1,32 @@
{ pkgs }:
{
environment.systemPackages = with pkgs; [
# nix
nixpkgs-review
# ripping
abcde
handbrake
picard
# other
anki
calibre
jellyfin-media-player
keepassxc
stable.libreoffice # HACK to fix build error
pavucontrol
stable.signal-desktop
tlaplusToolbox
vlc
thunderbird
plantuml
jetbrains.pycharm-professional
synology-drive-client
texlive.combined.scheme-full
];
}

26
modules/programs/chromium.nix Normal file
View File

@ -0,0 +1,26 @@
{ config
, lib
, pkgs
, ...
}:
with lib;
let
cfg = config.my.programs.chromium;
in
{
options.my.programs.chromium = {
enable = mkEnableOption "chromium";
package = mkOption {
type = types.package;
default = pkgs.stable.chromium;
defaultText = "pkgs.chromium";
description = "Chromium package to install.";
};
};
config = mkIf cfg.enable {
programs.chromium.enable = true;
environment.systemPackages = [ cfg.package ];
};
}

3
modules/programs/default.nix
View File

@ -2,6 +2,7 @@
imports = [ imports = [
./adb.nix ./adb.nix
./bspwm ./bspwm
./chromium.nix
./code.nix ./code.nix
./direnv.nix ./direnv.nix
./firefox.nix ./firefox.nix
@ -17,13 +18,13 @@
./ledger ./ledger
./logseq.nix ./logseq.nix
./miracast.nix ./miracast.nix
./nvim
./python.nix ./python.nix
./rofi ./rofi
./spotify.nix ./spotify.nix
./ssh.nix ./ssh.nix
./sway.nix ./sway.nix
./thunar.nix ./thunar.nix
./nvim
./zathura.nix ./zathura.nix
./zsh.nix ./zsh.nix
]; ];

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

@ -43,8 +43,8 @@ in
general { general {
# See https://wiki.hyprland.org/Configuring/Variables/ for more # See https://wiki.hyprland.org/Configuring/Variables/ for more
gaps_in = 5 gaps_in = 3
gaps_out = 5 gaps_out = 3
border_size = 2 border_size = 2
col.active_border = rgba(1affffee) col.active_border = rgba(1affffee)
col.inactive_border = rgba(595959aa) col.inactive_border = rgba(595959aa)

6
modules/programs/nvim/init.lua
View File

@ -1,11 +1,15 @@
vim.loader.enable() vim.loader.enable()
-- Load custom treesitter grammar for org filetype
require("orgmode").setup_ts_grammar()
require("nvim-treesitter.configs").setup({ require("nvim-treesitter.configs").setup({
sync_install = false, sync_install = false,
auto_install = false, auto_install = false,
highlight = { highlight = {
enable = true, enable = true,
additional_vim_regex_highlighting = false, -- Required for spellcheck, some LaTex highlights and
-- code block highlights that do not have ts grammar
additional_vim_regex_highlighting = { "org" },
}, },
}) })

16
modules/programs/nvim/plugins/orgmode.lua
View File

@ -1,18 +1,4 @@
local orgmode = require("orgmode") require("orgmode").setup({
-- Load custom treesitter grammar for org filetype
orgmode.setup_ts_grammar()
-- Treesitter configuration
require("nvim-treesitter.configs").setup({
-- If TS highlights are not enabled at all, or disabled via `disable` prop,
-- highlighting will fallback to default Vim syntax highlighting
highlight = {
enable = true,
-- Required for spellcheck, some LaTex highlights and
-- code block highlights that do not have ts grammar
additional_vim_regex_highlighting = { "org" },
},
})
orgmode.setup({
org_agenda_files = { "~/Notes/org" }, org_agenda_files = { "~/Notes/org" },
org_default_notes_file = "~/Notes/org/refile.org", org_default_notes_file = "~/Notes/org/refile.org",
}) })

4
modules/security/default.nix
View File

@ -11,10 +11,10 @@
# tmpfs = /tmp is mounted in ram. Doing so makes temp file management speedy # tmpfs = /tmp is mounted in ram. Doing so makes temp file management speedy
# on ssd systems, and volatile! Because it's wiped on reboot. # on ssd systems, and volatile! Because it's wiped on reboot.
boot.tmpOnTmpfs = lib.mkDefault true; boot.tmp.useTmpfs = lib.mkDefault true;
# If not using tmpfs, which is naturally purged on reboot, we must clean it # If not using tmpfs, which is naturally purged on reboot, we must clean it
# /tmp ourselves. /tmp should be volatile storage! # /tmp ourselves. /tmp should be volatile storage!
boot.cleanTmpDir = lib.mkDefault (!config.boot.tmpOnTmpfs); boot.tmp.cleanOnBoot = lib.mkDefault (!config.boot.tmpOnTmpfs);
# Fix a security hole in place for backwards compatibility. See desc in # Fix a security hole in place for backwards compatibility. See desc in
# nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix # nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

1
overlays/packages.nix
View File

@ -5,6 +5,5 @@ _: prev:
agenix = inputs.agenix.packages.${prev.system}.default; agenix = inputs.agenix.packages.${prev.system}.default;
attic = inputs.attic.packages.${prev.system}.default; attic = inputs.attic.packages.${prev.system}.default;
hyprpaper = inputs.hyprpaper.packages.${prev.system}.default; hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
neovim-nightly = inputs.neovim.packages.${prev.system}.default;
nil = inputs.nil.packages.${prev.system}.default; nil = inputs.nil.packages.${prev.system}.default;
} }

5
overlays/vimPlugins.nix
View File

@ -43,5 +43,10 @@ with lib.my;
version = mkVersionInput inputs.gitignore-nvim; version = mkVersionInput inputs.gitignore-nvim;
src = inputs.gitignore-nvim; src = inputs.gitignore-nvim;
}; };
bufferline-nvim = prev.vimPlugins.bufferline-nvim.overrideAttrs (_: {
version = mkVersionInput inputs.bufferline-nvim;
src = inputs.bufferline-nvim;
});
}; };
} }