diff options
Diffstat (limited to '')
| -rw-r--r-- | audio.nix | 27 | ||||
| -rw-r--r-- | configuration.nix | 29 | ||||
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | hjem.nix | 24 | ||||
| -rw-r--r-- | lock-screen.nix | 18 | ||||
| -rw-r--r-- | lockscreen.nix | 2 | ||||
| -rw-r--r-- | overlays.nix | 13 | ||||
| -rw-r--r-- | x11.nix | 2 |
8 files changed, 58 insertions, 61 deletions
@@ -15,19 +15,18 @@ }; }; -# services.mpd = { -# enable = true; -# musicDirectory = "${config.home.homeDirectory}/Music"; -# playlistDirectory = "${config.home.homeDirectory}/.playlists"; -# # mixer_type "none" # maybe mess around with this some time, it will turn off volume in rmpc, but apparently it will make the sound more quality for music -# extraConfig = '' -# auto_update "yes" -# audio_output { -# type "pulse" -# name "PipeWire Output" -# } -# ''; -# }; - + # services.mpd = { + # enable = true; + # musicDirectory = "${config.home.homeDirectory}/Music"; + # playlistDirectory = "${config.home.homeDirectory}/.playlists"; + # # mixer_type "none" # maybe mess around with this some time, it will turn off volume in rmpc, but apparently it will make the sound more quality for music + # extraConfig = '' + # auto_update "yes" + # audio_output { + # type "pulse" + # name "PipeWire Output" + # } + # ''; + # }; } diff --git a/configuration.nix b/configuration.nix index e2f7cc3..31ca916 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,10 +2,10 @@ { imports = [ ./hardware-configuration.nix - ./lockscreen.nix -./x11.nix -./hjem.nix -./audio.nix + ./lockscreen.nix + ./x11.nix + ./hjem.nix + ./audio.nix ]; # Bootloader. @@ -37,14 +37,14 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ - (lib.lowPrio pkgs.vim) # Lower Vim's priority - (pkgs.writeShellApplication { - name = "vi"; - runtimeInputs = [ pkgs.nvi ]; - text = '' - exec ${pkgs.nvi}/bin/vi "$@" - ''; - }) + (lib.lowPrio pkgs.vim) # Lower Vim's priority + (pkgs.writeShellApplication { + name = "vi"; + runtimeInputs = [ pkgs.nvi ]; + text = '' + exec ${pkgs.nvi}/bin/vi "$@" + ''; + }) neovim wget git @@ -62,8 +62,6 @@ xdotool ]; - - programs.git = { enable = true; config = { @@ -79,7 +77,6 @@ }; }; - programs.steam = { enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play @@ -93,7 +90,6 @@ # programs here, NOT in environment.systemPackages ]; - # Some programs need SUID wrappers, can be configured further or are # started in user sessions. # programs.mtr.enable = true; @@ -105,7 +101,6 @@ # Services services.openssh.enable = true; - # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; @@ -17,11 +17,11 @@ }@inputs: { nixosConfigurations.nepsis = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs;}; + specialArgs = { inherit inputs; }; modules = [ hjem.nixosModules.default ./configuration.nix - ./overlays.nix + ./overlays.nix ]; }; }; @@ -18,20 +18,22 @@ directory = "/home/andrew"; files = { - ".config/sxhkd/sxhkdrc".text = builtins.readFile (pkgs.replaceVars ./dotfiles/sxhkdrc { - dmenu = pkgs.dmenu; - st = pkgs.st; - librewolf = pkgs.librewolf; - pamixer = pkgs.pamixer; - maim = pkgs.maim; - xdotool = pkgs.xdotool; - xclip = pkgs.xclip; - lockscreen = pkgs.lock-screen; -}); + ".config/sxhkd/sxhkdrc".text = builtins.readFile ( + pkgs.replaceVars ./dotfiles/sxhkdrc { + dmenu = pkgs.dmenu; + st = pkgs.st; + librewolf = pkgs.librewolf; + pamixer = pkgs.pamixer; + maim = pkgs.maim; + xdotool = pkgs.xdotool; + xclip = pkgs.xclip; + lockscreen = pkgs.lock-screen; + } + ); }; packages = with pkgs; [ discord -lazygit + lazygit ]; }; diff --git a/lock-screen.nix b/lock-screen.nix index 294a99e..ca45903 100644 --- a/lock-screen.nix +++ b/lock-screen.nix @@ -1,12 +1,12 @@ -{ pkgs } : +{ pkgs }: pkgs.writeShellApplication { - name = "lock-screen"; - runtimeInputs = [ pkgs.betterlockscreen ]; - text = '' - if [ ! -f "$HOME/.cache/betterlockscreen/current/lock_dimblur.png" ]; then - betterlockscreen -u "$HOME/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg" --fx dimblur - fi + name = "lock-screen"; + runtimeInputs = [ pkgs.betterlockscreen ]; + text = '' + if [ ! -f "$HOME/.cache/betterlockscreen/current/lock_dimblur.png" ]; then + betterlockscreen -u "$HOME/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg" --fx dimblur + fi - betterlockscreen -l dimblur - ''; + betterlockscreen -l dimblur + ''; } diff --git a/lockscreen.nix b/lockscreen.nix index 019ec8e..2ffb591 100644 --- a/lockscreen.nix +++ b/lockscreen.nix @@ -5,7 +5,7 @@ # $ nix search wget environment.systemPackages = with pkgs; [ betterlockscreen - lock-screen + lock-screen ]; programs.i3lock = { diff --git a/overlays.nix b/overlays.nix index 9b16600..bb80cf8 100644 --- a/overlays.nix +++ b/overlays.nix @@ -1,7 +1,8 @@ -{pkgs, ...} : { -nixpkgs.overlays = [ -(final: prev: { -lock-screen = import ./lock-screen.nix {pkgs= prev;}; -}) -]; +{ pkgs, ... }: +{ + nixpkgs.overlays = [ + (final: prev: { + lock-screen = import ./lock-screen.nix { pkgs = prev; }; + }) + ]; } @@ -25,7 +25,7 @@ windowManager.dwm.enable = true; desktopManager.runXdgAutostartIfNone = false; displayManager = { - setupCommands = ''''; + setupCommands = ""; sessionCommands = '' #!/bin/sh ${pkgs.xrandr}/bin/xrandr --output DP-3 --primary --mode 2560x1440 --rate 180 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 160 --pos 2560x360 |