commit 0ef20845e40ffdcefee4177e390c33cedc8f4816 · ryan.freumh.org/nixos

+19 -1

flake.lock

···

       370
       370
        
               "patchelf": "patchelf",

     

       371
       371
        
               "ryan-cv": "ryan-cv",

     

       372
       372
        
               "ryan-website": "ryan-website",

     

       373
       373
       -
               "twitcher": "twitcher"

     

       373
       373
       +
               "twitcher": "twitcher",

     

       374
       374
       +
               "wallpapers": "wallpapers"

     

       374
       375
        
             }

     

       375
       376
        
           },

     

       376
       377
        
           "ryan-cv": {

     
···

       530
       531
        
               "owner": "numtide",

     

       531
       532
        
               "repo": "flake-utils",

     

       532
       533
        
               "type": "github"

     

       534
       534
       +
             }

     

       535
       535
       +
           },

     

       536
       536
       +
           "wallpapers": {

     

       537
       537
       +
             "flake": false,

     

       538
       538
       +
             "locked": {

     

       539
       539
       +
               "lastModified": 1686522804,

     

       540
       540
       +
               "narHash": "sha256-EoBk7YX/nqus5eal7K4DVUkQI+n5Em4ApP2CX1uzf/c=",

     

       541
       541
       +
               "ref": "main",

     

       542
       542
       +
               "rev": "82796072518780cac51b3b06341ada3a2b45a060",

     

       543
       543
       +
               "revCount": 1,

     

       544
       544
       +
               "type": "git",

     

       545
       545
       +
               "url": "ssh://git@git.freumh.org/ryan/wallpapers.git"

     

       546
       546
       +
             },

     

       547
       547
       +
             "original": {

     

       548
       548
       +
               "ref": "main",

     

       549
       549
       +
               "type": "git",

     

       550
       550
       +
               "url": "ssh://git@git.freumh.org/ryan/wallpapers.git"

     

       533
       551
        
             }

     

       534
       552
        
           }

     

       535
       553
        
         },

+19 -3

flake.nix

···

       7
       7
        
           patchelf.url = "github:nixos/patchelf/ea2fca765c";

     

       8
       8
        
           eeww.url = "github:RyanGibb/eeww/nixos";

     

       9
       9
        
           aeon.url = "github:RyanGibb/aeon";

     

       10
       10
       -
       

     

       10
       10
       +
           wallpapers = {

     

       11
       11
       +
             url ="git+ssh://git@git.freumh.org/ryan/wallpapers.git?ref=main";

     

       12
       12
       +
             flake = false;

     

       13
       13
       +
           };

     

       11
       14
        
           eilean.url ="git+https://git@git.freumh.org/ryan/eilean-nix.git?ref=main";

     

       12
       15
        
           # eilean.url ="github:RyanGibb/eilean-nix/main";

     

       13
       16
        
           ryan-website.url = "git+https://git@git.freumh.org/ryan/website.git";

     
···

       28
       31
        
           aeon.inputs.nixpkgs.follows = "nixpkgs";

     

       29
       32
        
         };

     

       30
       33
        
       

     

       31
       31
       -
         outputs = { self, nixpkgs, nixpkgs-unstable, eilean, home-manager, ryan-website, patchelf, twitcher, nixos-hardware, eeww, aeon, ... }@inputs: rec {

     

       32
       32
       -
       

     

       34
       34
       +
         outputs = {

     

       35
       35
       +
           self,

     

       36
       36
       +
           nixpkgs,

     

       37
       37
       +
           nixpkgs-unstable,

     

       38
       38
       +
           nixos-hardware,

     

       39
       39
       +
           home-manager,

     

       40
       40
       +
           patchelf,

     

       41
       41
       +
           eeww,

     

       42
       42
       +
           aeon,

     

       43
       43
       +
           wallpapers,

     

       44
       44
       +
           eilean,

     

       45
       45
       +
           ryan-website,

     

       46
       46
       +
           twitcher,

     

       47
       47
       +
           ...

     

       48
       48
       +
         }@inputs: rec {

     

       33
       49
        
           nixosConfigurations =

     

       34
       50
        
             let

     

       35
       51
        
               hosts = builtins.attrNames (builtins.readDir ./hosts);

+2 -2

modules/personal/gui/i3.nix

···

       1
       1
       -
       { pkgs, config, lib, ... }:

     

       1
       1
       +
       { pkgs, config, lib, wallpapers, ... }:

     

       2
       2
        
       

     

       3
       3
        
       let cfg = config.personal.gui; in

     

       4
       4
        
       {

     

       5
       5
        
         options.personal.gui.i3 = lib.mkEnableOption "i3";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.i3 {

     

       8
       8
       -
           home-manager.users.${config.custom.username} = import ../home/i3.nix;

     

       8
       8
       +
           home-manager.users.${config.custom.username} = import ../home/i3.nix { inherit pkgs lib wallpapers; };

     

       9
       9
        
       

     

       10
       10
        
           services.xserver = {

     

       11
       11
        
             enable = true;

+2 -2

modules/personal/gui/sway.nix

···

       1
       1
       -
       { pkgs, config, lib, ... }:

     

       1
       1
       +
       { pkgs, config, lib, wallpapers, ... }:

     

       2
       2
        
       

     

       3
       3
        
       let cfg = config.personal.gui; in

     

       4
       4
        
       {

     

       5
       5
        
         options.personal.gui.sway = lib.mkEnableOption "sway";

     

       6
       6
        
       

     

       7
       7
        
         config = lib.mkIf cfg.sway {

     

       8
       8
       -
           home-manager.users.${config.custom.username} = import ../home/sway.nix;

     

       8
       8
       +
           home-manager.users.${config.custom.username} = import ../home/sway.nix { inherit pkgs lib wallpapers; };

     

       9
       9
        
       

     

       10
       10
        
           programs.sway =

     

       11
       11
        
           let

+6 -2

modules/personal/home/i3.nix

···

       1
       1
       -
       { pkgs, config, lib, ... }:

     

       1
       1
       +
       { pkgs, lib, wallpapers, ... }:

     

       2
       2
        
       

     

       3
       3
        
       let replacements = {

     

       4
       4
        
         wm = "i3";

     
···

       11
       11
        
         wallpaper = ''

     

       12
       12
        
         '';

     

       13
       13
        
         set_wallpaper = ''

     

       14
       14
       -
           feh --bg-fill $WALLPAPER_DIR/default

     

       14
       14
       +
           feh --bg-fill $HOME/.cache/wallpaper

     

       15
       15
        
         '';

     

       16
       16
        
         locker = "xsecurelock";

     

       17
       17
        
         enable_output  = "xrandr --output $laptop_output --auto";

     
···

       37
       37
        
         # idling

     

       38
       38
        
       

     

       39
       39
        
         home.pointerCursor.x11.enable = true;

     

       40
       40
       +
       

     

       41
       41
       +
         home.sessionVariables = {

     

       42
       42
       +
           WALLPAPER_DIR = wallpapers;

     

       43
       43
       +
         };

     

       40
       44
        
       

     

       41
       45
        
         home.file = {

     

       42
       46
        
           ".xinitrc".text = ''

+4 -2

modules/personal/home/sway.nix

···

       1
       1
       -
       { pkgs, lib, ... }:

     

       1
       1
       +
       { pkgs, lib, wallpapers, ... }:

     

       2
       2
        
       

     

       3
       3
        
       let replacements = {

     

       4
       4
        
         wm = "sway";

     
···

       11
       11
        
         locked = "--locked";

     

       12
       12
        
         polkit_gnome = "${pkgs.polkit_gnome}";

     

       13
       13
        
         set_wallpaper = ''

     

       14
       14
       -
           swaymsg "output * bg $WALLPAPER_DIR/default fill #2e3440"

     

       14
       14
       +
           swaymsg "output * bg $HOME/.cache/wallpaper fill #2e3440"

     

       15
       15
        
         '';

     

       16
       16
        
         locker = "swaylock -f -i ~/pictures/wallpapers/default";

     

       17
       17
        
         enable_output  = "swaymsg output $laptop_output enable";

     
···

       49
       49
        
           # for screensharing

     

       50
       50
        
           XDG_SESSION_TYPE = "wayland";

     

       51
       51
        
           XDG_CURRENT_DESKTOP = "sway";

     

       52
       52
       +
       

     

       53
       53
       +
           WALLPAPER_DIR = wallpapers;

     

       52
       54
        
         };

     

       53
       55
        
       

     

       54
       56
        
         home.file = {

+1 -3

modules/personal/home/wm/scripts/set_random_wallpaper.sh

···

       1
       1
        
       #!/usr/bin/env bash

     

       2
       2
        
       

     

       3
       3
       -
       WALLPAPER_DIR=~/pictures/wallpapers

     

       4
       4
       -
       

     

       5
       5
       -
       ln -sf "$(find $WALLPAPER_DIR -type f | sort -R | tail -1)" $WALLPAPER_DIR/default

     

       3
       3
       +
       ln -sf "$(find $WALLPAPER_DIR -type f | sort -R | tail -1)" $HOME/.cache/wallpaper

     

       6
       4
        
       

     

       7
       5
        
       @set_wallpaper@

+3 -5

modules/personal/home/wm/scripts/set_selected_wallpaper.sh

···

       1
       1
        
       #!/usr/bin/env bash

     

       2
       2
        
       

     

       3
       3
       -
       WALLPAPER_DIR=$HOME/pictures/wallpapers

     

       4
       4
       -
       

     

       5
       5
       -
       WALLPAPER=$(ls $WALLPAPER_DIR | while read A ; do  echo -en "$A\x00icon\x1f$WALLPAPER_DIR/$A\n"; done | rofi -dmenu -p "$(basename "$(readlink -f $WALLPAPER_DIR/default)")") || exit 1

     

       3
       3
       +
       WALLPAPER=$(ls $WALLPAPER_DIR | while read A ; do  echo -en "$A\x00icon\x1f$WALLPAPER_DIR/$A\n"; done | rofi -dmenu -p "$(basename "$(readlink -f $HOME/.cache/wallpaper)")") || exit 1

     

       6
       4
        
       

     

       7
       5
        
       # for wofi:

     

       8
       8
       -
       #	WALLPAPER=$(ls $WALLPAPER_DIR | while read A ; do echo -en "img:$WALLPAPER_DIR/${A}:text:${A}\n"; done | wofi -d -I -p "$(basename "$(readlink -f $WALLPAPER_DIR/default)")") || exit 1I

     

       6
       6
       +
       #	WALLPAPER=$(ls $WALLPAPER_DIR | while read A ; do echo -en "img:$WALLPAPER_DIR/${A}:text:${A}\n"; done | wofi -d -I -p "$(basename "$(readlink -f $HOME/.cache/wallpaper)")") || exit 1I

     

       9
       7
        
       # but very slow...

     

       10
       8
        
       # from https://dotfiles.cloudninja.pw/scripts/wofipaper

     

       11
       9
        
       

     

       12
       12
       -
       ln -sf "$WALLPAPER_DIR/$WALLPAPER" $WALLPAPER_DIR/default || exit 1

     

       10
       10
       +
       ln -sf "$WALLPAPER_DIR/$WALLPAPER" $HOME/.cache/wallpaper || exit 1

     

       13
       11
        
       

     

       14
       12
        
       @set_wallpaper@

+1 -3

modules/personal/home/wm/scripts/set_wallpaper.sh

···

       1
       1
        
       #!/usr/bin/env bash

     

       2
       2
        
       

     

       3
       3
       -
       WALLPAPER_DIR=~/pictures/wallpapers

     

       4
       4
       -
       

     

       5
       3
        
       WALLPAPER="$1"

     

       6
       4
        
       

     

       7
       5
        
       echo $WALLPAPER

     

       8
       8
       -
       ln -sf "$WALLPAPER" $WALLPAPER_DIR/default || exit 1

     

       6
       6
       +
       ln -sf "$WALLPAPER" $HOME/.cache/wallpaper || exit 1

     

       9
       7
        
       

     

       10
       8
        
       @set_wallpaper@