Compare commits
	
		
			6 commits
		
	
	
		
			531fae0bb0
			...
			fb9cd8b9e9
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| fb9cd8b9e9 | |||
| 2316cb2d9c | |||
| 31a4c4060a | |||
| ade31510a8 | |||
| b25f1f9f4b | |||
| bdef46f0b2 | 
					 7 changed files with 53 additions and 23 deletions
				
			
		|  | @ -75,9 +75,9 @@ | ||||||
| 
 | 
 | ||||||
|   networking.hostName = "Tibo-NixDesk"; |   networking.hostName = "Tibo-NixDesk"; | ||||||
| 
 | 
 | ||||||
|   services.xserver = { |   services.xserver.xkb = { | ||||||
|     layout = "us"; |     layout = "us"; | ||||||
|     xkbVariant = "altgr-intl"; |     variant = "altgr-intl"; | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   system.stateVersion = "24.05"; |   system.stateVersion = "24.05"; | ||||||
|  |  | ||||||
|  | @ -6,8 +6,6 @@ in { | ||||||
|   options.sisyphus.services.pipewire.enable = lib.mkEnableOption "Pipewire"; |   options.sisyphus.services.pipewire.enable = lib.mkEnableOption "Pipewire"; | ||||||
| 
 | 
 | ||||||
|   config = lib.mkIf cfg.enable { |   config = lib.mkIf cfg.enable { | ||||||
|     sound.enable = true; |  | ||||||
|     hardware.pulseaudio.enable = false; |  | ||||||
|     security.rtkit.enable = true; |     security.rtkit.enable = true; | ||||||
|     services.pipewire = { |     services.pipewire = { | ||||||
|       enable = true; |       enable = true; | ||||||
|  | @ -20,6 +18,26 @@ in { | ||||||
|       # use the example session manager (no others are packaged yet so this is enabled by default, |       # use the example session manager (no others are packaged yet so this is enabled by default, | ||||||
|       # no need to redefine it in your config for now) |       # no need to redefine it in your config for now) | ||||||
|       #media-session.enable = true; |       #media-session.enable = true; | ||||||
|  | 
 | ||||||
|  |       wireplumber = { | ||||||
|  |         enable = true; | ||||||
|  |         # Fix pops after silence | ||||||
|  |         extraConfig."99-disable-suspend" = { | ||||||
|  |           "monitor.alsa.rules" = [ | ||||||
|  |             { | ||||||
|  |               matches = [ | ||||||
|  |                 # Headphone jack on laptop | ||||||
|  |                 { "node.name" = "alsa_output.pci-0000_00_1f.3.analog-stereo"; } | ||||||
|  |               ]; | ||||||
|  |               actions = { | ||||||
|  |                 update-props = { | ||||||
|  |                   "session.suspend-timeout-seconds" = 0; | ||||||
|  |                 }; | ||||||
|  |               }; | ||||||
|  |             } | ||||||
|  |           ]; | ||||||
|  |         }; | ||||||
|  |       }; | ||||||
|     }; |     }; | ||||||
|   }; |   }; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -10,7 +10,7 @@ in { | ||||||
|       printing.enable = true; |       printing.enable = true; | ||||||
|       avahi = { |       avahi = { | ||||||
|         enable = true; |         enable = true; | ||||||
|         nssmdns = true; |         nssmdns4 = true; | ||||||
|         openFirewall = true; |         openFirewall = true; | ||||||
|       }; |       }; | ||||||
|     }; |     }; | ||||||
|  |  | ||||||
|  | @ -12,6 +12,11 @@ in { | ||||||
|       enableOnBoot = false; |       enableOnBoot = false; | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|  |     # Updated version of deprecated enableNvidia. | ||||||
|     hardware.nvidia-container-toolkit.enable = true; |     hardware.nvidia-container-toolkit.enable = true; | ||||||
|  | 
 | ||||||
|  |     sisyphus.users.wantedGroups = [ | ||||||
|  |       "docker" | ||||||
|  |     ]; | ||||||
|   }; |   }; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -41,6 +41,7 @@ in { | ||||||
|       letter                 # Personal font |       letter                 # Personal font | ||||||
|       noto-fonts-cjk         # Dependency of Zellij config |       noto-fonts-cjk         # Dependency of Zellij config | ||||||
|       noto-fonts             # Dependency of Zellij config |       noto-fonts             # Dependency of Zellij config | ||||||
|  |       noto-fonts-color-emoji # Emoji's! | ||||||
|       vistafonts             # Microsoft fonts |       vistafonts             # Microsoft fonts | ||||||
|     ]; |     ]; | ||||||
| 
 | 
 | ||||||
|  | @ -60,20 +61,21 @@ in { | ||||||
|         packages = (with pkgs; [ |         packages = (with pkgs; [ | ||||||
|           cmdtime               # Zsh plugin |           cmdtime               # Zsh plugin | ||||||
|           icosystem             # Personal icon theme |           icosystem             # Personal icon theme | ||||||
|  |           nextcloud-client | ||||||
|           spotify-adblock |           spotify-adblock | ||||||
|         ]) ++ (with pkgs-unstable; [ |         ]) ++ (with pkgs-unstable; [ | ||||||
|           brave |           brave | ||||||
|           chafa                 # Terminal image viewer |           chafa                 # Terminal image viewer | ||||||
|           duf                   # Df alternative |           duf                   # Df alternative | ||||||
|  |           feishin               # Jellyfin music client | ||||||
|           foot |           foot | ||||||
|           fzf |           fzf | ||||||
|           glow                  # Terminal Markdown renderer |           glow                  # Terminal Markdown renderer | ||||||
|           jellyfin-media-player |           jellyfin-media-player | ||||||
|           kitty |           libreoffice-fresh     # Office tools | ||||||
|           libreoffice-fresh |           # FIXME Waiting for electron version to update, now insecure. | ||||||
|           logseq |           # logseq                # Note taking | ||||||
|           mpv |           mpv                   # Media player | ||||||
|           nextcloud-client |  | ||||||
|           nsxiv                 # Lightweight image viewer |           nsxiv                 # Lightweight image viewer | ||||||
|           qalculate-gtk         # Calculator |           qalculate-gtk         # Calculator | ||||||
|           spotify |           spotify | ||||||
|  | @ -86,11 +88,13 @@ in { | ||||||
|           zsh-syntax-highlighting |           zsh-syntax-highlighting | ||||||
| 
 | 
 | ||||||
|           # SMB |           # SMB | ||||||
|           cifs-utils psmisc |           cifs-utils | ||||||
|  |           psmisc | ||||||
| 
 | 
 | ||||||
|           # Linters and LSPs |           # Linters and LSPs | ||||||
|           statix      # Nix |           statix      # Nix | ||||||
|           ruff pylint # Python |           # TODO Move to devshells | ||||||
|  |           # ruff pylint # Python | ||||||
|         ]); |         ]); | ||||||
| 
 | 
 | ||||||
|         pointerCursor = { |         pointerCursor = { | ||||||
|  |  | ||||||
|  | @ -22,15 +22,15 @@ while getopts ":bvt:p:" options; do | ||||||
| 			;; | 			;; | ||||||
| 		v) | 		v) | ||||||
|             # Get volume (don't use pamixer because that is way slower) |             # Get volume (don't use pamixer because that is way slower) | ||||||
|             value=$( amixer sget 'Master' \ |             value=$( pactl get-sink-volume @DEFAULT_SINK@ \ | ||||||
|                 | grep -o '\[[0-9]*%\]' \ |                 | grep -o '[0-9]*%' \ | ||||||
|                 | tr -d '][%' \ |                 | tr -d '%' \ | ||||||
|                 | head -n1 ) |                 | head -n1 ) | ||||||
|             title="Volume: ${value}%" |             title="Volume: ${value}%" | ||||||
|             category='sysinfo' |             category='sysinfo' | ||||||
| 
 | 
 | ||||||
|             # If audio disabled, set value to zero. |             # If audio disabled, set value to zero. | ||||||
| 	    if [ "$( amixer sget 'Master' | grep -o '\[\(on\|off\)\]' | head -n1 )" == "[off]" ] ; then  |             if [ "$( pactl get-sink-mute @DEFAULT_SINK@ | grep -o '\(yes\|no\)' | head -n1 )" == 'yes' ] ; then  | ||||||
|                 title="Volume: ${value}% (Disabled)" |                 title="Volume: ${value}% (Disabled)" | ||||||
|                 value=0 |                 value=0 | ||||||
|             fi |             fi | ||||||
|  |  | ||||||
|  | @ -82,6 +82,9 @@ Plug 'prabirshrestha/vim-lsp' | ||||||
| Plug 'sheerun/vim-polyglot' | Plug 'sheerun/vim-polyglot' | ||||||
| Plug 'vifm/vifm.vim' | Plug 'vifm/vifm.vim' | ||||||
| 
 | 
 | ||||||
|  | " Coq | ||||||
|  | Plug 'whonore/Coqtail' | ||||||
|  | 
 | ||||||
| call plug#end()  | call plug#end()  | ||||||
| 
 | 
 | ||||||
| " }}} | " }}} | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue