commit 8b28c648b1c9251e080f753a6bdea64136722e21 · wiro.world/dotfiles

+50 -84

flake.lock

···

       240
       240
        
           },

     

       241
       241
        
           "flake-utils": {

     

       242
       242
        
             "inputs": {

     

       243
       243
       -
               "systems": "systems_2"

     

       244
       244
       -
             },

     

       245
       245
       -
             "locked": {

     

       246
       246
       -
               "lastModified": 1731533236,

     

       247
       247
       -
               "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",

     

       248
       248
       -
               "owner": "numtide",

     

       249
       249
       -
               "repo": "flake-utils",

     

       250
       250
       -
               "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",

     

       251
       251
       -
               "type": "github"

     

       252
       252
       -
             },

     

       253
       253
       -
             "original": {

     

       254
       254
       -
               "owner": "numtide",

     

       255
       255
       -
               "repo": "flake-utils",

     

       256
       256
       -
               "type": "github"

     

       257
       257
       -
             }

     

       258
       258
       -
           },

     

       259
       259
       -
           "flake-utils_2": {

     

       260
       260
       -
             "inputs": {

     

       261
       261
       -
               "systems": "systems_4"

     

       243
       243
       +
               "systems": "systems_3"

     

       262
       244
        
             },

     

       263
       245
        
             "locked": {

     

       264
       246
        
               "lastModified": 1694529238,

     
···

       395
       377
        
           },

     

       396
       378
        
           "gomod2nix": {

     

       397
       379
        
             "inputs": {

     

       398
       398
       -
               "flake-utils": "flake-utils_2",

     

       380
       380
       +
               "flake-utils": "flake-utils",

     

       399
       381
        
               "nixpkgs": [

     

       400
       382
        
                 "tangled",

     

       401
       383
        
                 "nixpkgs"

     
···

       457
       439
        
               "type": "github"

     

       458
       440
        
             }

     

       459
       441
        
           },

     

       442
       442
       +
           "home-manager_2": {

     

       443
       443
       +
             "inputs": {

     

       444
       444
       +
               "nixpkgs": [

     

       445
       445
       +
                 "zen-browser",

     

       446
       446
       +
                 "nixpkgs"

     

       447
       447
       +
               ]

     

       448
       448
       +
             },

     

       449
       449
       +
             "locked": {

     

       450
       450
       +
               "lastModified": 1752603129,

     

       451
       451
       +
               "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",

     

       452
       452
       +
               "owner": "nix-community",

     

       453
       453
       +
               "repo": "home-manager",

     

       454
       454
       +
               "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",

     

       455
       455
       +
               "type": "github"

     

       456
       456
       +
             },

     

       457
       457
       +
             "original": {

     

       458
       458
       +
               "owner": "nix-community",

     

       459
       459
       +
               "repo": "home-manager",

     

       460
       460
       +
               "type": "github"

     

       461
       461
       +
             }

     

       462
       462
       +
           },

     

       460
       463
        
           "htmx-src": {

     

       461
       464
        
             "flake": false,

     

       462
       465
        
             "locked": {

     
···

       523
       526
        
               "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"

     

       524
       527
        
             }

     

       525
       528
        
           },

     

       526
       526
       -
           "jujutsu": {

     

       527
       527
       -
             "inputs": {

     

       528
       528
       -
               "flake-utils": "flake-utils",

     

       529
       529
       -
               "nixpkgs": [

     

       530
       530
       -
                 "unixpkgs"

     

       531
       531
       -
               ],

     

       532
       532
       -
               "rust-overlay": "rust-overlay_3"

     

       533
       533
       -
             },

     

       534
       534
       -
             "locked": {

     

       535
       535
       -
               "lastModified": 1759360197,

     

       536
       536
       -
               "narHash": "sha256-OW8kSDBBSZr0G3U27AAkZ3cH3TJmSARbg9Pc4qZ6tA0=",

     

       537
       537
       -
               "owner": "jj-vcs",

     

       538
       538
       -
               "repo": "jj",

     

       539
       539
       -
               "rev": "22900c9a9ba362efa442fed2dd4e6e1d5c22cc7a",

     

       540
       540
       -
               "type": "github"

     

       541
       541
       -
             },

     

       542
       542
       -
             "original": {

     

       543
       543
       -
               "owner": "jj-vcs",

     

       544
       544
       -
               "repo": "jj",

     

       545
       545
       -
               "type": "github"

     

       546
       546
       -
             }

     

       547
       547
       -
           },

     

       548
       529
        
           "lanzaboote": {

     

       549
       530
        
             "inputs": {

     

       550
       531
        
               "crane": "crane",

     
···

       554
       535
        
                 "unixpkgs"

     

       555
       536
        
               ],

     

       556
       537
        
               "pre-commit-hooks-nix": "pre-commit-hooks-nix",

     

       557
       557
       -
               "rust-overlay": "rust-overlay_4"

     

       538
       538
       +
               "rust-overlay": "rust-overlay_3"

     

       558
       539
        
             },

     

       559
       540
        
             "locked": {

     

       560
       541
        
               "lastModified": 1737639419,

     
···

       711
       692
        
               "git-leave": "git-leave",

     

       712
       693
        
               "helix": "helix",

     

       713
       694
        
               "home-manager": "home-manager",

     

       714
       714
       -
               "jujutsu": "jujutsu",

     

       715
       695
        
               "lanzaboote": "lanzaboote",

     

       716
       696
        
               "nix-darwin": "nix-darwin",

     

       717
       697
        
               "nixos-hardware": "nixos-hardware",

     
···

       720
       700
        
               "stylix": "stylix",

     

       721
       701
        
               "tangled": "tangled",

     

       722
       702
        
               "unixpkgs": "unixpkgs",

     

       723
       723
       -
               "wakatime-ls": "wakatime-ls"

     

       703
       703
       +
               "wakatime-ls": "wakatime-ls",

     

       704
       704
       +
               "zen-browser": "zen-browser"

     

       724
       705
        
             }

     

       725
       706
        
           },

     

       726
       707
        
           "rust-overlay": {

     
···

       768
       749
        
           "rust-overlay_3": {

     

       769
       750
        
             "inputs": {

     

       770
       751
        
               "nixpkgs": [

     

       771
       771
       -
                 "jujutsu",

     

       772
       772
       -
                 "nixpkgs"

     

       773
       773
       -
               ]

     

       774
       774
       -
             },

     

       775
       775
       -
             "locked": {

     

       776
       776
       -
               "lastModified": 1755139244,

     

       777
       777
       -
               "narHash": "sha256-SN1BFA00m+siVAQiGLtTwjv9LV9TH5n8tQcSziV6Nv4=",

     

       778
       778
       -
               "owner": "oxalica",

     

       779
       779
       -
               "repo": "rust-overlay",

     

       780
       780
       -
               "rev": "aeae248beb2a419e39d483dd9b7fec924aba8d4d",

     

       781
       781
       -
               "type": "github"

     

       782
       782
       -
             },

     

       783
       783
       -
             "original": {

     

       784
       784
       -
               "owner": "oxalica",

     

       785
       785
       -
               "repo": "rust-overlay",

     

       786
       786
       -
               "type": "github"

     

       787
       787
       -
             }

     

       788
       788
       -
           },

     

       789
       789
       -
           "rust-overlay_4": {

     

       790
       790
       -
             "inputs": {

     

       791
       791
       -
               "nixpkgs": [

     

       792
       752
        
                 "lanzaboote",

     

       793
       753
        
                 "nixpkgs"

     

       794
       754
        
               ]

     
···

       807
       767
        
               "type": "github"

     

       808
       768
        
             }

     

       809
       769
        
           },

     

       810
       810
       -
           "rust-overlay_5": {

     

       770
       770
       +
           "rust-overlay_4": {

     

       811
       771
        
             "inputs": {

     

       812
       772
        
               "nixpkgs": [

     

       813
       773
        
                 "wakatime-ls",

     
···

       874
       834
        
                 "nixpkgs"

     

       875
       835
        
               ],

     

       876
       836
        
               "nur": "nur",

     

       877
       877
       -
               "systems": "systems_3",

     

       837
       837
       +
               "systems": "systems_2",

     

       878
       838
        
               "tinted-foot": "tinted-foot",

     

       879
       839
        
               "tinted-kitty": "tinted-kitty",

     

       880
       840
        
               "tinted-schemes": "tinted-schemes",

     
···

       941
       901
        
               "type": "github"

     

       942
       902
        
             }

     

       943
       903
        
           },

     

       944
       944
       -
           "systems_4": {

     

       945
       945
       -
             "locked": {

     

       946
       946
       -
               "lastModified": 1681028828,

     

       947
       947
       -
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       948
       948
       -
               "owner": "nix-systems",

     

       949
       949
       -
               "repo": "default",

     

       950
       950
       -
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       951
       951
       -
               "type": "github"

     

       952
       952
       -
             },

     

       953
       953
       -
             "original": {

     

       954
       954
       -
               "owner": "nix-systems",

     

       955
       955
       -
               "repo": "default",

     

       956
       956
       -
               "type": "github"

     

       957
       957
       -
             }

     

       958
       958
       -
           },

     

       959
       904
        
           "tangled": {

     

       960
       905
        
             "inputs": {

     

       961
       906
        
               "flake-compat": "flake-compat_2",

     
···

       1110
       1055
        
               "nixpkgs": [

     

       1111
       1056
        
                 "nixpkgs"

     

       1112
       1057
        
               ],

     

       1113
       1113
       -
               "rust-overlay": "rust-overlay_5"

     

       1058
       1058
       +
               "rust-overlay": "rust-overlay_4"

     

       1114
       1059
        
             },

     

       1115
       1060
        
             "locked": {

     

       1116
       1061
        
               "lastModified": 1752245636,

     
···

       1123
       1068
        
             "original": {

     

       1124
       1069
        
               "owner": "mrnossiom",

     

       1125
       1070
        
               "repo": "wakatime-ls",

     

       1071
       1071
       +
               "type": "github"

     

       1072
       1072
       +
             }

     

       1073
       1073
       +
           },

     

       1074
       1074
       +
           "zen-browser": {

     

       1075
       1075
       +
             "inputs": {

     

       1076
       1076
       +
               "home-manager": "home-manager_2",

     

       1077
       1077
       +
               "nixpkgs": [

     

       1078
       1078
       +
                 "unixpkgs"

     

       1079
       1079
       +
               ]

     

       1080
       1080
       +
             },

     

       1081
       1081
       +
             "locked": {

     

       1082
       1082
       +
               "lastModified": 1761535208,

     

       1083
       1083
       +
               "narHash": "sha256-E1PobJMiFmVUX2YdqYk/MpKb0LXavOYvlg8DCBBzlHc=",

     

       1084
       1084
       +
               "owner": "0xc000022070",

     

       1085
       1085
       +
               "repo": "zen-browser-flake",

     

       1086
       1086
       +
               "rev": "79a94872a3e6993a051c4e22a2dcb02c1d088acf",

     

       1087
       1087
       +
               "type": "github"

     

       1088
       1088
       +
             },

     

       1089
       1089
       +
             "original": {

     

       1090
       1090
       +
               "owner": "0xc000022070",

     

       1091
       1091
       +
               "repo": "zen-browser-flake",

     

       1126
       1092
        
               "type": "github"

     

       1127
       1093
        
             }

     

       1128
       1094
        
           }

+3 -3

flake.nix

···

       40
       40
        
           helix.url = "github:helix-editor/helix";

     

       41
       41
        
           helix.inputs.nixpkgs.follows = "unixpkgs";

     

       42
       42
        
       

     

       43
       43
       -
           jujutsu.url = "github:jj-vcs/jj";

     

       44
       44
       -
           jujutsu.inputs.nixpkgs.follows = "unixpkgs";

     

       45
       45
       -
       

     

       46
       43
        
           tangled.url = "git+https://tangled.org/@tangled.org/core";

     

       47
       44
        
           tangled.inputs.nixpkgs.follows = "unixpkgs";

     

       48
       45
        
       

     

       49
       46
        
           wakatime-ls.url = "github:mrnossiom/wakatime-ls";

     

       50
       47
        
           wakatime-ls.inputs.nixpkgs.follows = "nixpkgs";

     

       48
       48
       +
       

     

       49
       49
       +
           zen-browser.url = "github:0xc000022070/zen-browser-flake";

     

       50
       50
       +
           zen-browser.inputs.nixpkgs.follows = "unixpkgs";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
         outputs = { self, nixpkgs, ... }:

+15 -1

home-manager/fragments/firefox.nix

···

       1
       1
       -
       { config

     

       1
       1
       +
       { self

     

       2
       2
       +
       , config

     

       2
       3
        
       , lib

     

       3
       4
        
       , pkgs

     

       4
       5
        
       , ...

     

       5
       6
        
       }:

     

       6
       7
        
       

     

       7
       8
        
       let

     

       9
       9
       +
         inherit (self.inputs) zen-browser;

     

       10
       10
       +
       

     

       8
       11
        
         cfg = config.local.fragment.firefox;

     

       9
       12
        
       in

     

       10
       13
        
       {

     
···

       12
       15
        
           Firefox related

     

       13
       16
        
         '';

     

       14
       17
        
       

     

       18
       18
       +
         imports = [

     

       19
       19
       +
           zen-browser.homeModules.beta

     

       20
       20
       +
         ];

     

       21
       21
       +
       

     

       15
       22
        
         config = lib.mkIf cfg.enable {

     

       16
       23
        
           home.sessionVariables.BROWSER = lib.getExe pkgs.firefox;

     

       17
       24
        
       

     

       18
       25
        
           stylix.targets.firefox = {

     

       19
       26
        
             enable = false;

     

       20
       27
        
             profileNames = [ "default" ];

     

       28
       28
       +
           };

     

       29
       29
       +
       

     

       30
       30
       +
           programs.zen-browser = {

     

       31
       31
       +
             enable = true;

     

       32
       32
       +
       

     

       33
       33
       +
             policies = config.programs.firefox.policies;

     

       34
       34
       +
             # profiles = config.programs.firefox.profiles;

     

       21
       35
        
           };

     

       22
       36
        
       

     

       23
       37
        
           programs.firefox = {

+2 -1

home-manager/fragments/helix.nix

···

       1
       1
        
       { self

     

       2
       2
        
       , config

     

       3
       3
        
       , pkgs

     

       4
       4
       +
       , upkgs

     

       4
       5
        
       , lpkgs

     

       5
       6
        
       , lib

     

       6
       7
        
       , ...

     
···

       32
       33
        
       

     

       33
       34
        
           programs.helix = {

     

       34
       35
        
             enable = true;

     

       35
       35
       -
             package = if flags.onlyCached then pkgs.helix else lpkgs.helix;

     

       36
       36
       +
             package = if flags.onlyCached then upkgs.helix else lpkgs.helix;

     

       36
       37
        
             defaultEditor = true;

     

       37
       38
        
       

     

       38
       39
        
             settings = {

+2 -4

home-manager/fragments/jujutsu.nix

···

       1
       1
        
       { config

     

       2
       2
        
       , lib

     

       3
       3
        
       , pkgs

     

       4
       4
       -
       , lpkgs

     

       4
       4
       +
       , upkgs

     

       5
       5
        
       , ...

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         flags = config.local.flags;

     

       10
       10
       -
       

     

       11
       9
        
         keys = import ../../secrets/keys.nix;

     

       12
       10
        
       

     

       13
       11
        
         cfg = config.local.fragment.jujutsu;

     
···

       20
       18
        
         config = lib.mkIf cfg.enable {

     

       21
       19
        
           programs.jujutsu = {

     

       22
       20
        
             enable = true;

     

       23
       23
       -
             package = if flags.onlyCached then pkgs.jujutsu else lpkgs.jujutsu;

     

       21
       21
       +
             package = upkgs.jujutsu;

     

       24
       22
        
       

     

       25
       23
        
             settings = {

     

       26
       24
        
               user = {

+1 -2

pkgs/default.nix

···

       1
       1
        
       { self, system, ... }@pkgs:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         inherit (self.inputs) agenix git-leave helix jujutsu wakatime-ls;

     

       4
       4
       +
         inherit (self.inputs) agenix git-leave helix wakatime-ls;

     

       5
       5
        
       in

     

       6
       6
        
       {

     

       7
       7
        
         asak = pkgs.callPackage ./asak.nix { };

     
···

       15
       15
        
         inherit (agenix.packages.${system}) agenix;

     

       16
       16
        
         inherit (git-leave.packages.${system}) git-leave;

     

       17
       17
        
         inherit (helix.packages.${system}) helix;

     

       18
       18
       -
         inherit (jujutsu.packages.${system}) jujutsu;

     

       19
       18
        
         inherit (wakatime-ls.packages.${system}) wakatime-ls;

     

       20
       19
        
       }