commit c6bb86a76b6e54a6cce778df04e7e316d605a61f · ryan.freumh.org/nixos

+44 -1

flake.lock

···

       1102
        
               "nixpkgs-flaresolverr": "nixpkgs-flaresolverr",

     

       1103
        
               "nixpkgs-sonarr": "nixpkgs-sonarr",

     

       1104
        
               "nixpkgs-unstable": "nixpkgs-unstable",

     

       1105
       -
               "nur": "nur"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1106
        
             }

     

       1107
        
           },

     

       1108
        
           "scss-reset": {

     
···

       1223
        
             "original": {

     

       1224
        
               "owner": "nix-systems",

     

       1225
        
               "repo": "default",

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1226
        
               "type": "github"

     

       1227
        
             }

     

       1228
        
           },

···

       1102
        
               "nixpkgs-flaresolverr": "nixpkgs-flaresolverr",

     

       1103
        
               "nixpkgs-sonarr": "nixpkgs-sonarr",

     

       1104
        
               "nixpkgs-unstable": "nixpkgs-unstable",

     

       1105
       +
               "nur": "nur",

     

       1106
       +
               "timewall": "timewall"

     

       1107
       +
             }

     

       1108
       +
           },

     

       1109
       +
           "rust-overlay": {

     

       1110
       +
             "inputs": {

     

       1111
       +
               "nixpkgs": [

     

       1112
       +
                 "timewall",

     

       1113
       +
                 "nixpkgs"

     

       1114
       +
               ]

     

       1115
       +
             },

     

       1116
       +
             "locked": {

     

       1117
       +
               "lastModified": 1734230139,

     

       1118
       +
               "narHash": "sha256-zsp0Mz8VgyIAnU8UhP/YT1g+zlsl+NIJTBMAbY+RifQ=",

     

       1119
       +
               "owner": "oxalica",

     

       1120
       +
               "repo": "rust-overlay",

     

       1121
       +
               "rev": "150fbc8aa2bc501041810bbc1dbfe73694a861be",

     

       1122
       +
               "type": "github"

     

       1123
       +
             },

     

       1124
       +
             "original": {

     

       1125
       +
               "owner": "oxalica",

     

       1126
       +
               "repo": "rust-overlay",

     

       1127
       +
               "type": "github"

     

       1128
        
             }

     

       1129
        
           },

     

       1130
        
           "scss-reset": {

     
···

       1245
        
             "original": {

     

       1246
        
               "owner": "nix-systems",

     

       1247
        
               "repo": "default",

     

       1248
       +
               "type": "github"

     

       1249
       +
             }

     

       1250
       +
           },

     

       1251
       +
           "timewall": {

     

       1252
       +
             "inputs": {

     

       1253
       +
               "nixpkgs": [

     

       1254
       +
                 "nixpkgs"

     

       1255
       +
               ],

     

       1256
       +
               "rust-overlay": "rust-overlay"

     

       1257
       +
             },

     

       1258
       +
             "locked": {

     

       1259
       +
               "lastModified": 1737041980,

     

       1260
       +
               "narHash": "sha256-LE8gW4lGB4atru+zcpYGSQCRe/VUzsS7Hd/5Ru5ZR8Q=",

     

       1261
       +
               "owner": "RyanGibb",

     

       1262
       +
               "repo": "timewall",

     

       1263
       +
               "rev": "62ad75972a73fa6179e6082d6b83f2585844c77c",

     

       1264
       +
               "type": "github"

     

       1265
       +
             },

     

       1266
       +
             "original": {

     

       1267
       +
               "owner": "RyanGibb",

     

       1268
       +
               "repo": "timewall",

     

       1269
        
               "type": "github"

     

       1270
        
             }

     

       1271
        
           },

+3

flake.nix

···

       20
        
           hyperbib-eeg.url = "github:RyanGibb/hyperbib?ref=nixify";

     

       21
        
           nix-rpi5.url = "gitlab:vriska/nix-rpi5?ref=main";

     

       22
        
           nur.url = "github:nix-community/NUR/e9e77b7985ef9bdeca12a38523c63d47555cc89b";

     

       0
        
       
     

       23
        
       

     

       24
        
           # deduplicate flake inputs

     

       25
        
           eilean.inputs.nixpkgs.follows = "nixpkgs";

     
···

       36
        
           hyperbib-eeg.inputs.nixpkgs.follows = "nixpkgs";

     

       37
        
           nix-rpi5.inputs.nixpkgs.follows = "nixpkgs";

     

       38
        
           nur.inputs.nixpkgs.follows = "nixpkgs";

     

       0
        
       
     

       39
        
         };

     

       40
        
       

     

       41
        
         outputs =

     
···

       88
        
                     inherit system;

     

       89
        
                     config = nixpkgsConfig;

     

       90
        
                   }).sonarr;

     

       0
        
       
     

       91
        
               })

     

       92
        
               inputs.nur.overlays.default

     

       93
        
             ];

···

       20
        
           hyperbib-eeg.url = "github:RyanGibb/hyperbib?ref=nixify";

     

       21
        
           nix-rpi5.url = "gitlab:vriska/nix-rpi5?ref=main";

     

       22
        
           nur.url = "github:nix-community/NUR/e9e77b7985ef9bdeca12a38523c63d47555cc89b";

     

       23
       +
           timewall.url = "github:RyanGibb/timewall";

     

       24
        
       

     

       25
        
           # deduplicate flake inputs

     

       26
        
           eilean.inputs.nixpkgs.follows = "nixpkgs";

     
···

       37
        
           hyperbib-eeg.inputs.nixpkgs.follows = "nixpkgs";

     

       38
        
           nix-rpi5.inputs.nixpkgs.follows = "nixpkgs";

     

       39
        
           nur.inputs.nixpkgs.follows = "nixpkgs";

     

       40
       +
           timewall.inputs.nixpkgs.follows = "nixpkgs";

     

       41
        
         };

     

       42
        
       

     

       43
        
         outputs =

     
···

       90
        
                     inherit system;

     

       91
        
                     config = nixpkgsConfig;

     

       92
        
                   }).sonarr;

     

       93
       +
                 timewall = final.overlay-unstable.timewall;

     

       94
        
               })

     

       95
        
               inputs.nur.overlays.default

     

       96
        
             ];

+17 -1

home/gui/default.nix

···

       3
        
         config,

     

       4
        
         lib,

     

       5
        
         ...

     

       6
       -
       }:

     

       7
        
       

     

       8
        
       let

     

       9
        
         cfg = config.custom.gui;

     
···

       12
        
         imports = [

     

       13
        
           ./i3.nix

     

       14
        
           ./sway.nix

     

       0
        
       
     

       15
        
         ];

     

       16
        
       

     

       17
        
         options.custom.gui.enable = lib.mkEnableOption "gui";

     
···

       48
        
                 };

     

       49
        
               in

     

       50
        
               [ status ];

     

       0
        
       
     

       51
        
             sessionVariables = {

     

       52
        
               # evince workaround

     

       53
        
               GTK_THEME = "Gruvbox-Dark";

     
···

       181
        
               desktop = "$HOME/";

     

       182
        
               templates = "$HOME/";

     

       183
        
               publicShare = "$HOME/";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       184
        
             };

     

       185
        
           };

     

       186
        
         };

···

       3
        
         config,

     

       4
        
         lib,

     

       5
        
         ...

     

       6
       +
       }@inputs:

     

       7
        
       

     

       8
        
       let

     

       9
        
         cfg = config.custom.gui;

     
···

       12
        
         imports = [

     

       13
        
           ./i3.nix

     

       14
        
           ./sway.nix

     

       15
       +
           inputs.timewall.homeManagerModules.default

     

       16
        
         ];

     

       17
        
       

     

       18
        
         options.custom.gui.enable = lib.mkEnableOption "gui";

     
···

       49
        
                 };

     

       50
        
               in

     

       51
        
               [ status ];

     

       52
       +
       

     

       53
        
             sessionVariables = {

     

       54
        
               # evince workaround

     

       55
        
               GTK_THEME = "Gruvbox-Dark";

     
···

       183
        
               desktop = "$HOME/";

     

       184
        
               templates = "$HOME/";

     

       185
        
               publicShare = "$HOME/";

     

       186
       +
             };

     

       187
       +
           };

     

       188
       +
       

     

       189
       +
           services.timewall = {

     

       190
       +
             config = {

     

       191
       +
               location = {

     

       192
       +
                 lat = 52;

     

       193
       +
                 lon = 0;

     

       194
       +
               };

     

       195
       +
               setter.command = [

     

       196
       +
                 "sh"

     

       197
       +
                 "-c"

     

       198
       +
                 "ln -fs %f ~/.cache/timewall/last_image && swaymsg output \\* bg %f fill #282828"

     

       199
       +
               ];

     

       200
        
             };

     

       201
        
           };

     

       202
        
         };

+1 -1

home/gui/sway.nix

···

       18
        
           '';

     

       19
        
           locked = "--locked";

     

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

     

       21
       -
           locker = "swaylock -f -i $WALLPAPER";

     

       22
        
           enable_output = "swaymsg output $laptop_output enable";

     

       23
        
           disable_output = "swaymsg output $laptop_output disable";

     

       24
        
           drun = "wofi -i --show drun --allow-images -a";

···

       18
        
           '';

     

       19
        
           locked = "--locked";

     

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

     

       21
       +
           locker = "swaylock -f -i ~/.cache/timewall/last_image";

     

       22
        
           enable_output = "swaymsg output $laptop_output enable";

     

       23
        
           disable_output = "swaymsg output $laptop_output disable";

     

       24
        
           drun = "wofi -i --show drun --allow-images -a";

+3 -1

home/gui/wm/sway/exec

···

       4
        
       exec_always "pkill kanshi; kanshi"

     

       5
        
       

     

       6
        
       # https://elis.nu/blog/2021/02/detailed-setup-of-screen-sharing-in-sway/#orga91b409

     

       7
       -
       exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP

     

       8
        
       exec dbus-update-activation-environment WAYLAND_DISPLAY

     

       9
        
       

     

       10
        
       # https://github.com/yory8/clipman/issues/59

     

       11
        
       exec wl-paste -t text --watch clipman store -P --max-items=100

     

       12
        
       

     

       13
        
       exec systemctl --user start gammastep

     

       0
        
       
     

       0

···

       4
        
       exec_always "pkill kanshi; kanshi"

     

       5
        
       

     

       6
        
       # https://elis.nu/blog/2021/02/detailed-setup-of-screen-sharing-in-sway/#orga91b409

     

       7
       +
       exec systemctl --user import-environment XDG_SESSION_TYPE XDG_CURRENT_DESKTOP SWAYSOCK

     

       8
        
       exec dbus-update-activation-environment WAYLAND_DISPLAY

     

       9
        
       

     

       10
        
       # https://github.com/yory8/clipman/issues/59

     

       11
        
       exec wl-paste -t text --watch clipman store -P --max-items=100

     

       12
        
       

     

       13
        
       exec systemctl --user start gammastep

     

       14
       +
       

     

       15
       +
       exec timewall set --daemon

-2

home/gui/wm/sway/output

···

       1
       -
       

     

       2
       -
       output * bg $WALLPAPER fill #282828

+1

modules/gui/default.nix

···

       100
        
               pulseaudio

     

       101
        
               tridactyl-native

     

       102
        
               vlc

     

       0
        
       
     

       103
        
             ]

     

       104
        
             ++ desktopEntries;

     

       105

···

       100
        
               pulseaudio

     

       101
        
               tridactyl-native

     

       102
        
               vlc

     

       103
       +
               timewall

     

       104
        
             ]

     

       105
        
             ++ desktopEntries;

     

       106

+1

modules/home-manager.nix

···

       11
        
             useGlobalPkgs = true;

     

       12
        
             extraSpecialArgs = {

     

       13
        
               i3-workspace-history = inputs.i3-workspace-history;

     

       0
        
       
     

       14
        
             };

     

       15
        
             users.${config.custom.username} = import ../home/default.nix;

     

       16
        
           };

···

       11
        
             useGlobalPkgs = true;

     

       12
        
             extraSpecialArgs = {

     

       13
        
               i3-workspace-history = inputs.i3-workspace-history;

     

       14
       +
               timewall = inputs.timewall;

     

       15
        
             };

     

       16
        
             users.${config.custom.username} = import ../home/default.nix;

     

       17
        
           };