ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-21 09:49:39 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: ellmau:69b6e27c074f45c0f11b22208d04d877edd990da
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake
..
compare: ellmau:3618ecf30113e5ed057b50b786ad0eed93b3e9f4
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake

No commits in common. "69b6e27c074f45c0f11b22208d04d877edd990da" and "3618ecf30113e5ed057b50b786ad0eed93b3e9f4" have entirely different histories.
69b6e27c07 ... 3618ecf301

3 changed files with 70 additions and 32 deletions
Show Stats Expand all files Collapse all files

36
flake.lock generated
View File

@ -71,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684207621, "lastModified": 1683604309,
"narHash": "sha256-6WphXBsSTqdCIle9+gpcnIACl+LfUE6jL5HlTeeiRTc=", "narHash": "sha256-o+ii3SdNh7VITaEkL1+l8phiktwk5ADNIHAkC4iA12w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "f8824fa1a882d07921d229c35d7076428e9d9075", "rev": "6fe1b6ed8880aa6631be652b9c7eac98bca7307f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +229,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1684169666, "lastModified": 1683269598,
"narHash": "sha256-N5jrykeSxLVgvm3Dd3hZ38/XwM/jU+dltqlXgrGlYxk=", "narHash": "sha256-KNsb+nBbB1Fmxd07dt4E0KXMT4YeKJB7gQaA6Xfk+mo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "71ce85372a614d418d5e303dd5702a79d1545c04", "rev": "51559e691f1493a26f94f1df1aaf516bb507e78b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -292,11 +292,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1684025543, "lastModified": 1683504292,
"narHash": "sha256-hGe7S+i5je+8E/b2mOXVI9nmr038Dw+bV8e1P8xHSe0=", "narHash": "sha256-jlZbBIKGa6IMGkcJkQ08pbKnouTAPfeq1fD5I7l/rBw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c6d2f3dc0d3efd4285eebe4f8a36a47ba438138e", "rev": "ba0086c178d4ed60a7899f739caea553eca2e046",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -308,11 +308,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1684139381, "lastModified": 1683408522,
"narHash": "sha256-YPLMeYE+UzxxP0qbkBzv3RBDvyGR5I4d7v2n8dI3+fY=", "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "17a689596b72d1906883484838eb1aaf51ab8001", "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1684130981, "lastModified": 1683546353,
"narHash": "sha256-5IPp/rUAOogega5xuRoxcpfkwlGDAyWdizL0Tp2GA4s=", "narHash": "sha256-zEfx6q4fXK5wq+RCsyM0FyWBKNNhHTKMpCWkEpKDe2g=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d41eea2839de7de0f2cbe4aa90fde5db8afcd30a", "rev": "7629f9b0680d87c7775f3261bee746da5dac76d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +384,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1684032930, "lastModified": 1683545104,
"narHash": "sha256-ueeSYDii2e5bkKrsSdP12JhkW9sqgYrUghLC8aDfYGQ=", "narHash": "sha256-48wC0zzHAej/wLFWIgV+uj63AvQ2UUk85g7wmXJzTqk=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "a376127bb5277cd2c337a9458744f370aaf2e08d", "rev": "36b062a2c85a0efb37de1300c79c54602a094fab",
"type": "github" "type": "github"
}, },
"original": { "original": {

28
machines/nucturne/default.nix
View File

@ -1,6 +1,11 @@
{ config, pkgs, inputs, nixos-hardware, ... }: { {
imports = config,
[ ../../common/users.nix ./hardware-configuration.nix ./software.nix ]; pkgs,
inputs,
nixos-hardware,
...
}: {
imports = [../../common/users.nix ./hardware-configuration.nix ./software.nix];
elss = { elss = {
# base system # base system
@ -14,10 +19,9 @@
# enable X11 with lightdm and i3 # enable X11 with lightdm and i3
graphical = { graphical = {
enable = true; enable = true;
sway.enable = false; sway.enable = true;
i3.enable = false; i3.enable = false;
plasma.enable = false; plasma.enable = false;
xmonad.enable = true;
# set dpi if used in mobile applications # set dpi if used in mobile applications
# dpi = 180; # dpi = 180;
}; };
@ -29,10 +33,10 @@
openvpn.enable = true; openvpn.enable = true;
# nm-networks # nm-networks
networking.nmConnections = [ ]; networking.nmConnections = [];
# enable sops # enable sops
sops = { enable = true; }; sops = {enable = true;};
# enable wireguard # enable wireguard
wireguard.enable = true; wireguard.enable = true;
@ -40,17 +44,17 @@
# user setup # user setup
users = { users = {
enable = true; enable = true;
admins = [ "ellmau" ]; admins = ["ellmau"];
users = [ ]; users = [];
meta = { ellmau.git = { signDefault = true; }; }; meta = {ellmau.git = {signDefault = true;};};
}; };
}; };
boot = { boot = {
extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ]; extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
kernelModules = [ "v4l2loopback" ]; kernelModules = ["v4l2loopback"];
plymouth.enable = true; plymouth.enable = true;
}; };

38
users/ellmau/conf/xmonad/xmonad.hs
View File

@ -37,6 +37,41 @@ main' :: D.Client -> IO ()
main = mkDbusClient >>= main' main = mkDbusClient >>= main'
workSpaces = ["code", "web", "misc", "comm"] ++ map show ([5 .. 9] ++ [0]) workSpaces = ["code", "web", "misc", "comm"] ++ map show ([5 .. 9] ++ [0])
layout :: XMonad.Layout.LayoutModifier.ModifiedLayout
SmartBorder
(XMonad.Layout.LayoutModifier.ModifiedLayout
AvoidStruts
(PerWorkspace
(Choose
(XMonad.Layout.LayoutModifier.ModifiedLayout Rename ThreeCol)
(Choose
Tall
(Choose
(Mirror Tall)
(Choose
Grid
(Choose
Full
(XMonad.Layout.LayoutModifier.ModifiedLayout
(XMonad.Layout.Decoration.Decoration
TabbedDecoration XMonad.Layout.Decoration.DefaultShrinker)
XMonad.Layout.Simplest.Simplest))))))
(Choose
Tall
(Choose
(Mirror Tall)
(Choose
Grid
(Choose
Full
(Choose
(XMonad.Layout.LayoutModifier.ModifiedLayout
(XMonad.Layout.Decoration.Decoration
TabbedDecoration XMonad.Layout.Decoration.DefaultShrinker)
XMonad.Layout.Simplest.Simplest)
(XMonad.Layout.LayoutModifier.ModifiedLayout
Rename ThreeCol))))))))
Window
layout = smartBorders $ avoidStruts $ layout = smartBorders $ avoidStruts $
onWorkspace "comm" (threemid ||| tall ||| Mirror tall ||| Grid ||| Full ||| simpleTabbed) $ onWorkspace "comm" (threemid ||| tall ||| Mirror tall ||| Grid ||| Full ||| simpleTabbed) $
(tall ||| Mirror tall ||| Grid ||| Full ||| simpleTabbed ||| threemid) (tall ||| Mirror tall ||| Grid ||| Full ||| simpleTabbed ||| threemid)
@ -86,7 +121,6 @@ keyMap c = mkKeymap c $
, ("M-S-r" , refresh) , ("M-S-r" , refresh)
, ("M-j" , windows W.focusUp) , ("M-j" , windows W.focusUp)
, ("M-k" , windows W.focusDown) , ("M-k" , windows W.focusDown)
, ("M-f" , windows W.swapMaster)
, ("M-S-j" , windows W.swapUp) , ("M-S-j" , windows W.swapUp)
, ("M-S-k" , windows W.swapDown) , ("M-S-k" , windows W.swapDown)
, ("M-;" , viewEmptyWorkspace) , ("M-;" , viewEmptyWorkspace)
@ -164,7 +198,7 @@ polybarHook dbus =
, ppUrgent = wrapper highlighted $ Just urgent , ppUrgent = wrapper highlighted $ Just urgent
, ppHidden = wrapper free Nothing , ppHidden = wrapper free Nothing
, ppHiddenNoWindows = mempty , ppHiddenNoWindows = mempty
, ppTitleSanitize = wrapper title Nothing . shorten 60 , ppTitle = wrapper title Nothing . shorten 60
} }
fadeHook :: Rational -> Rational -> X () fadeHook :: Rational -> Rational -> X ()