Compare commits
5 Commits
b27558c854
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
c635c66424
|
|||
|
0002ee021b
|
|||
|
0a4a0737ff
|
|||
|
7ed536d39a
|
|||
|
46c54570d6
|
@@ -100,6 +100,7 @@ in
|
|||||||
"video"
|
"video"
|
||||||
"render"
|
"render"
|
||||||
"adbusers"
|
"adbusers"
|
||||||
|
"flatpak"
|
||||||
];
|
];
|
||||||
hashedPasswordFile = config.sops.secrets."user_password".path;
|
hashedPasswordFile = config.sops.secrets."user_password".path;
|
||||||
};
|
};
|
||||||
@@ -153,6 +154,8 @@ in
|
|||||||
XDG_STATE_HOME = "$HOME/.local/state";
|
XDG_STATE_HOME = "$HOME/.local/state";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
services.flatpak.enable = true;
|
||||||
|
|
||||||
# ── Keyring ───────────────────────────────────────────────────────────
|
# ── Keyring ───────────────────────────────────────────────────────────
|
||||||
security.pam.services = {
|
security.pam.services = {
|
||||||
login.enableGnomeKeyring = true;
|
login.enableGnomeKeyring = true;
|
||||||
@@ -181,10 +184,10 @@ in
|
|||||||
udisks2.enable = true;
|
udisks2.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Set stateVersion. Leave it as set.
|
|
||||||
nixpkgs.config = {
|
nixpkgs.config = {
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
permittedInsecurePackages = [ "electron-32.3.3" ];
|
permittedInsecurePackages = [ "electron-32.3.3" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
system.stateVersion = "26.05";
|
system.stateVersion = "26.05";
|
||||||
}
|
}
|
||||||
|
|||||||
125
flake.lock
generated
125
flake.lock
generated
@@ -5,11 +5,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774799062,
|
"lastModified": 1779876564,
|
||||||
"narHash": "sha256-U9RGxFsLeKivD1+7sVXj5TltHGfB4m/dkn3dENT2fSM=",
|
"narHash": "sha256-0cPac2/hEW5hnfNaKd+fHVjWb3dScO2VyExme1vIZDQ=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "948a8ee84858d053b83f01c8c168f9f4347937e6",
|
"rev": "7d283dea9a4e25cfa9a544eb40933d256cb57957",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -26,11 +26,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772408722,
|
"lastModified": 1778716662,
|
||||||
"narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
|
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
|
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -47,11 +47,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769996383,
|
"lastModified": 1778716662,
|
||||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -106,11 +106,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775143651,
|
"lastModified": 1779726696,
|
||||||
"narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=",
|
"narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e",
|
"rev": "1a95e2efb477959b70b4a14c51035975c0481df6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -126,11 +126,11 @@
|
|||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775138742,
|
"lastModified": 1779840270,
|
||||||
"narHash": "sha256-cyipL9p0VzyZT0wa+3KkeJYvtEYzyI1PjBOnGU8z3gI=",
|
"narHash": "sha256-bXW8ErSJJD1XnPvNrGvMYAOHqpH8uaIzovK6UWTIybM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "neovim-nightly-overlay",
|
"repo": "neovim-nightly-overlay",
|
||||||
"rev": "0fff256cfbc6978e711c43555df210d46940e943",
|
"rev": "145c6bcb4b6b34781827ca0ac8356cc5da08c098",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -142,11 +142,11 @@
|
|||||||
"neovim-src": {
|
"neovim-src": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774915197,
|
"lastModified": 1779837173,
|
||||||
"narHash": "sha256-yor+eo8CVi7wBp7CjAMQnVoK+m197gsl7MvUzaqicns=",
|
"narHash": "sha256-JI/pXTMZA33WAlgsO7gEq23CeKIqKEyV25G5BqN7FDw=",
|
||||||
"owner": "neovim",
|
"owner": "neovim",
|
||||||
"repo": "neovim",
|
"repo": "neovim",
|
||||||
"rev": "dbc4800dda2b0dc3290dc79955f857256e0694e2",
|
"rev": "b3dfa86e02b0ce0f3ef9bc7b90dbbd790e7da31e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -162,11 +162,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775098553,
|
"lastModified": 1779855493,
|
||||||
"narHash": "sha256-OFWIVY1vzAbPE73ksKAMsFh11AXZ3MjIymRQ90Butnc=",
|
"narHash": "sha256-03zI9JM/tz+APwMvVgKXSeLhAM0oev+58/Xs//4+Bbg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-vscode-extensions",
|
"repo": "nix-vscode-extensions",
|
||||||
"rev": "361b17a5b2f4536a119c794a367a29b07691f941",
|
"rev": "70518f6c1987061b291bb53abfd7846d6838c23f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -177,11 +177,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773821835,
|
"lastModified": 1778869304,
|
||||||
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=",
|
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0",
|
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -193,11 +193,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774701658,
|
"lastModified": 1779694939,
|
||||||
"narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=",
|
"narHash": "sha256-Ly4j75O8ICaSQx3uxPnwk2x7PMF0XQvn5r0c3yBA7FI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe",
|
"rev": "f9d8b65950353691ab56561e7c73d2e1063d810b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -209,11 +209,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775036866,
|
"lastModified": 1779560665,
|
||||||
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
|
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -225,11 +225,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775036866,
|
"lastModified": 1779560665,
|
||||||
"narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=",
|
"narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6201e203d09599479a3b3450ed24fa81537ebc4e",
|
"rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -241,11 +241,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772419343,
|
"lastModified": 1776329215,
|
||||||
"narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=",
|
"narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9",
|
"rev": "b86751bc4085f48661017fa226dee99fab6c651b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -264,11 +264,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774802402,
|
"lastModified": 1779816597,
|
||||||
"narHash": "sha256-L1UJ/zxKTyyaGGmytH6OYlgQ0HGSMhvPkvU+iz4Mkb8=",
|
"narHash": "sha256-Kgod3gZlhSp6WozZ2pFaclXbWpjs6kQLAtldoxb85Lc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "cbd8536a05d1aae2593cb5c9ace1010c8c5845cb",
|
"rev": "297f9341476ba7f821a42d7a2805e206ef8c6ef8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -283,11 +283,11 @@
|
|||||||
"nixpkgs": "nixpkgs_4"
|
"nixpkgs": "nixpkgs_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775159663,
|
"lastModified": 1779896237,
|
||||||
"narHash": "sha256-KES+OClaN0Vy/BkjW60UFo3dnQWpjkd1vIKEoynnlk0=",
|
"narHash": "sha256-YzY59P/YrX3gEGqjFwtIUzgTQKZhbX/Wj4PgKm/u+bE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "008b7b102054965988abf26ea261314a2e6672d5",
|
"rev": "4098cdd0f88012976d35c0c007194fd35eceb5c9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -306,7 +306,8 @@
|
|||||||
"nixvim": "nixvim",
|
"nixvim": "nixvim",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"yazi": "yazi"
|
"yazi": "yazi",
|
||||||
|
"zen-browser": "zen-browser"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
@@ -317,11 +318,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772420823,
|
"lastModified": 1776741231,
|
||||||
"narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=",
|
"narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c",
|
"rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -337,11 +338,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774910634,
|
"lastModified": 1777944972,
|
||||||
"narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=",
|
"narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301",
|
"rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -387,11 +388,11 @@
|
|||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1775132067,
|
"lastModified": 1779676204,
|
||||||
"narHash": "sha256-JFcGvXwV9O55bUDY9MilD2+/qUPqYg9IHsdH6oJzCGw=",
|
"narHash": "sha256-/DLVKPqrU3WuY99jrHjYuIR0yGl98mGS6izK5rC1gZM=",
|
||||||
"owner": "sxyazi",
|
"owner": "sxyazi",
|
||||||
"repo": "yazi",
|
"repo": "yazi",
|
||||||
"rev": "86b8f0779ca5406fb6fead8c248d3ab23c9b1db0",
|
"rev": "cf8b54179ea0de392629d93081afca9e5587225e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -399,6 +400,26 @@
|
|||||||
"repo": "yazi",
|
"repo": "yazi",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
"zen-browser": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1779946062,
|
||||||
|
"narHash": "sha256-M/2bCPYjiBTkDNV29J/00z10RM3yYnL9X74RqAHDme0=",
|
||||||
|
"owner": "youwen5",
|
||||||
|
"repo": "zen-browser-flake",
|
||||||
|
"rev": "2e2c38ba20a3d614d0196e0aa44851547306e861",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "youwen5",
|
||||||
|
"repo": "zen-browser-flake",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
@@ -35,6 +35,11 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
yazi.url = "github:sxyazi/yazi";
|
yazi.url = "github:sxyazi/yazi";
|
||||||
|
|
||||||
|
zen-browser = {
|
||||||
|
url = "github:youwen5/zen-browser-flake";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
@@ -48,6 +53,7 @@
|
|||||||
nur,
|
nur,
|
||||||
sops-nix,
|
sops-nix,
|
||||||
yazi,
|
yazi,
|
||||||
|
zen-browser,
|
||||||
...
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -56,11 +56,4 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
||||||
nixpkgs.config = {
|
|
||||||
allowUnfree = true;
|
|
||||||
permittedInsecurePackages = [
|
|
||||||
"electron-32.3.3"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,5 +28,6 @@
|
|||||||
./zathura.nix
|
./zathura.nix
|
||||||
./zoom.nix
|
./zoom.nix
|
||||||
./zsh.nix
|
./zsh.nix
|
||||||
|
./zen.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -198,8 +198,18 @@
|
|||||||
:text "${date}")))
|
:text "${date}")))
|
||||||
|
|
||||||
;; ── River State ─────────────────────────────────────────────────────
|
;; ── River State ─────────────────────────────────────────────────────
|
||||||
|
(deflisten river_tag
|
||||||
|
:initial ""
|
||||||
|
`ristate -t | jq -r '.tags.Unknown[0] // empty'`)
|
||||||
|
|
||||||
|
(deflisten river_title
|
||||||
|
:initial "-"
|
||||||
|
`ristate -w | jq -r '.title // "-"'`)
|
||||||
|
|
||||||
|
(deflisten river_layout
|
||||||
|
:initial "-"
|
||||||
|
`ristate -l | jq -r '.layout // "-"'`)
|
||||||
|
|
||||||
(defvar ws1 "ws-empty")
|
|
||||||
(defvar ws2 "ws-empty")
|
(defvar ws2 "ws-empty")
|
||||||
(defvar ws3 "ws-empty")
|
(defvar ws3 "ws-empty")
|
||||||
(defvar ws4 "ws-empty")
|
(defvar ws4 "ws-empty")
|
||||||
@@ -220,7 +230,7 @@
|
|||||||
:orientation "horizontal"
|
:orientation "horizontal"
|
||||||
:class "workspace-buttons"
|
:class "workspace-buttons"
|
||||||
|
|
||||||
(button :onclick "riverctl set-focused-tags 1" :class "workspace-button ${ws1}" (label :text "1"))
|
(button :onclick "riverctl set-focused-tags 1" :class "workspace-button ${river_tag == \"1\" ? \"ws-current\" : \"ws-empty\"}" (label :text "1"))
|
||||||
(label :text " ")
|
(label :text " ")
|
||||||
(button :onclick "riverctl set-focused-tags 2" :class "workspace-button ${ws2}" (label :text "2"))
|
(button :onclick "riverctl set-focused-tags 2" :class "workspace-button ${ws2}" (label :text "2"))
|
||||||
(label :text " ")
|
(label :text " ")
|
||||||
@@ -232,7 +242,7 @@
|
|||||||
(label :text " ")
|
(label :text " ")
|
||||||
(button :onclick "riverctl set-focused-tags 6" :class "workspace-button ${ws6}" (label :text "6"))
|
(button :onclick "riverctl set-focused-tags 6" :class "workspace-button ${ws6}" (label :text "6"))
|
||||||
(label :text " ")
|
(label :text " ")
|
||||||
(button :onclick "riverctl set-focused-tags 7" :class "workspace-button ${ws7}" (label :text "7"))
|
;; (button :onclick "riverctl set-focused-tags 7" :class "workspace-button ${river_tag == \"7\" ? \"ws-current\" : \"ws-empty\"}" (label :text "s"))
|
||||||
(label :text " ")
|
(label :text " ")
|
||||||
(button :onclick "riverctl set-focused-tags 8" :class "workspace-button ${ws8}" (label :text "8"))
|
(button :onclick "riverctl set-focused-tags 8" :class "workspace-button ${ws8}" (label :text "8"))
|
||||||
(label :text " ")
|
(label :text " ")
|
||||||
@@ -241,11 +251,11 @@
|
|||||||
|
|
||||||
(defwidget widgetWindows []
|
(defwidget widgetWindows []
|
||||||
(label
|
(label
|
||||||
:text "${windows}"))
|
:text "${river_title}"))
|
||||||
|
|
||||||
(defwidget widgetLayouts []
|
(defwidget widgetLayouts []
|
||||||
(label
|
(label
|
||||||
:text "${layouts}"))
|
:text "${river_layout}"))
|
||||||
|
|
||||||
(defwidget widgetLogSeperator []
|
(defwidget widgetLogSeperator []
|
||||||
(label
|
(label
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
TEMP_FILE="/tmp/river-eww-status"
|
|
||||||
|
|
||||||
while true; do
|
|
||||||
ristate -t >"$TEMP_FILE.tmp"
|
|
||||||
ristate -w >>"$TEMP_FILE.tmp"
|
|
||||||
mv "$TEMP_FILE.tmp" "$TEMP_FILE"
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
@@ -1,32 +1,35 @@
|
|||||||
TEMP_FILE="/tmp/river-eww-status"
|
layout=$(ristate -l 2>/dev/null | jq -r '.layout // ""')
|
||||||
|
title=$(ristate -w 2>/dev/null | jq -r '.title // ""')
|
||||||
|
tags_json=$(ristate -t 2>/dev/null)
|
||||||
|
views_json=$(ristate -vt 2>/dev/null)
|
||||||
|
|
||||||
# Read last two lines (layout/tags and focused window)
|
mapfile -t focused_tags < <(
|
||||||
json=$(tail -n2 "$TEMP_FILE" | head -n1)
|
printf '%s\n' "$views_json" |
|
||||||
win_json=$(tail -n1 "$TEMP_FILE")
|
jq -r '.viewstag.Unknown // [] | .[] | tostring'
|
||||||
|
)
|
||||||
|
|
||||||
# Extract layout
|
if [ "${#focused_tags[@]}" -eq 0 ]; then
|
||||||
layout=$(echo "$json" | jq -r '.layout // ""')
|
mapfile -t focused_tags < <(
|
||||||
|
printf '%s\n' "$tags_json" |
|
||||||
|
jq -r '.tags.Unknown // [] | .[] | tostring'
|
||||||
|
)
|
||||||
|
fi
|
||||||
|
|
||||||
# Extract focused window title
|
|
||||||
windows=$(echo "$win_json" | jq -r '.title // ""')
|
|
||||||
|
|
||||||
# Extract focused tags as array
|
|
||||||
mapfile -t focused_tags < <(echo "$json" | jq -r '.tags.BOE // [] | .[]')
|
|
||||||
|
|
||||||
# Update workspace classes
|
|
||||||
for i in $(seq 1 9); do
|
for i in $(seq 1 9); do
|
||||||
class="ws-empty"
|
class="ws-empty"
|
||||||
for tag in "${focused_tags[@]}"; do
|
for tag in "${focused_tags[@]}"; do
|
||||||
if [[ "$tag" == "$i" ]]; then
|
if [[ "$tag" == "$i" ]]; then
|
||||||
class="ws-current"
|
class="ws-current"
|
||||||
|
echo "$tag - current"
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
eww update ws$i="$class"
|
eww update "ws$i=$class"
|
||||||
done
|
done
|
||||||
|
|
||||||
# Update layout
|
eww update "layouts=$layout"
|
||||||
eww update layouts="$layout"
|
echo "$layouts"
|
||||||
|
eww update "windows=$title"
|
||||||
# Output focused window for widget
|
|
||||||
echo "$windows"
|
echo "$windows"
|
||||||
|
|
||||||
|
echo "$title"
|
||||||
|
|||||||
@@ -76,17 +76,20 @@ in
|
|||||||
plugin = {
|
plugin = {
|
||||||
prepend_previewers = [
|
prepend_previewers = [
|
||||||
{
|
{
|
||||||
|
group = "preview";
|
||||||
run = "exifaudio";
|
run = "exifaudio";
|
||||||
mime = "audio/*";
|
mime = "audio/*";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
prepend_fetchers = [
|
prepend_fetchers = [
|
||||||
{
|
{
|
||||||
|
group = "fetcher";
|
||||||
id = "git";
|
id = "git";
|
||||||
url = "*";
|
url = "*";
|
||||||
run = "git";
|
run = "git";
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
group = "fetcher";
|
||||||
id = "git";
|
id = "git";
|
||||||
url = "*/";
|
url = "*/";
|
||||||
run = "git";
|
run = "git";
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, inputs, ... }:
|
{ inputs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
@@ -11,12 +11,11 @@
|
|||||||
programs.nixvim = {
|
programs.nixvim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
extraPackages = with pkgs; [
|
|
||||||
texlive.combined.scheme-full
|
|
||||||
# papis-nvim
|
|
||||||
];
|
|
||||||
|
|
||||||
nixpkgs.useGlobalPackages = false;
|
nixpkgs = {
|
||||||
|
useGlobalPackages = false;
|
||||||
|
config.allowUnfree = true;
|
||||||
|
};
|
||||||
|
|
||||||
clipboard.providers.wl-copy.enable = true;
|
clipboard.providers.wl-copy.enable = true;
|
||||||
keymaps = [
|
keymaps = [
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
{ pkgs,... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.nixvim = {
|
programs.nixvim = {
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
texliveFull
|
texlive.combined.scheme-full
|
||||||
texlivePackages.standalone
|
|
||||||
texlivePackages.relsize # needed for BA
|
|
||||||
# papis-nvim
|
# papis-nvim
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -14,6 +12,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
lazyLoad.settings.filetype = [ "tex" ];
|
lazyLoad.settings.filetype = [ "tex" ];
|
||||||
|
|
||||||
|
texlivePackage = pkgs.texlive.combined.scheme-full;
|
||||||
settings = {
|
settings = {
|
||||||
view_automatic = false;
|
view_automatic = false;
|
||||||
mappings_disable = {
|
mappings_disable = {
|
||||||
|
|||||||
@@ -119,7 +119,7 @@
|
|||||||
# Powerbutton
|
# Powerbutton
|
||||||
"None XF86PowerOff" = "spawn '/home/$USER/.config/eww/scripts/powermenu.sh'";
|
"None XF86PowerOff" = "spawn '/home/$USER/.config/eww/scripts/powermenu.sh'";
|
||||||
# Program
|
# Program
|
||||||
"Super C" = "spawn 'firefox'";
|
"Super C" = "spawn 'zen'";
|
||||||
"Super Y" = "spawn 'signal-desktop'";
|
"Super Y" = "spawn 'signal-desktop'";
|
||||||
"Super X" = "spawn 'Telegram'";
|
"Super X" = "spawn 'Telegram'";
|
||||||
"Super V" = "spawn 'thunderbird'";
|
"Super V" = "spawn 'thunderbird'";
|
||||||
|
|||||||
@@ -54,13 +54,6 @@
|
|||||||
tls.enable = true;
|
tls.enable = true;
|
||||||
};
|
};
|
||||||
realName = "Elias Schröter";
|
realName = "Elias Schröter";
|
||||||
signature = {
|
|
||||||
text = ''
|
|
||||||
Mit freundlichen Grüßen,
|
|
||||||
Elias Schröter.
|
|
||||||
'';
|
|
||||||
showSignature = "append";
|
|
||||||
};
|
|
||||||
passwordCommand = "mail-password";
|
passwordCommand = "mail-password";
|
||||||
smtp = {
|
smtp = {
|
||||||
host = "postout.lrz.de";
|
host = "postout.lrz.de";
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.vscode = {
|
programs.vscodium = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.vscodium;
|
package = pkgs.vscodium;
|
||||||
profiles.default = {
|
profiles.default = {
|
||||||
|
|||||||
80
home/programs/zen.nix
Normal file
80
home/programs/zen.nix
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
{
|
||||||
|
inputs,
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
extension = shortId: guid: {
|
||||||
|
name = guid;
|
||||||
|
value = {
|
||||||
|
install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
|
||||||
|
installation_mode = "normal_installed";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
prefs = {
|
||||||
|
# Check these out at about:config
|
||||||
|
"extensions.autoDisableScopes" = 0;
|
||||||
|
"extensions.pocket.enabled" = false;
|
||||||
|
# ...
|
||||||
|
};
|
||||||
|
|
||||||
|
extensions = [
|
||||||
|
# To add additional extensions, find it on addons.mozilla.org, find
|
||||||
|
# the short ID in the url (like https://addons.mozilla.org/en-US/firefox/addon/!SHORT_ID!/)
|
||||||
|
# Then go to https://addons.mozilla.org/api/v5/addons/addon/!SHORT_ID!/ to get the guid
|
||||||
|
(extension "ublock-origin" "uBlock0@raymondhill.net")
|
||||||
|
# ...
|
||||||
|
];
|
||||||
|
|
||||||
|
in
|
||||||
|
{
|
||||||
|
home.packages = [
|
||||||
|
(pkgs.wrapFirefox
|
||||||
|
inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.zen-browser-unwrapped
|
||||||
|
{
|
||||||
|
extraPrefs = lib.concatLines (
|
||||||
|
lib.mapAttrsToList (
|
||||||
|
name: value: "lockPref(${lib.strings.toJSON name}, ${lib.strings.toJSON value});"
|
||||||
|
) prefs
|
||||||
|
);
|
||||||
|
|
||||||
|
extraPolicies = {
|
||||||
|
DisableTelemetry = true;
|
||||||
|
ExtensionSettings = builtins.listToAttrs extensions;
|
||||||
|
|
||||||
|
SearchEngines = {
|
||||||
|
Default = "ecosia";
|
||||||
|
Add = [
|
||||||
|
{
|
||||||
|
Name = "nixpkgs packages";
|
||||||
|
URLTemplate = "https://search.nixos.org/packages?query={searchTerms}";
|
||||||
|
IconURL = "https://wiki.nixos.org/favicon.ico";
|
||||||
|
Alias = "@np";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
Name = "NixOS options";
|
||||||
|
URLTemplate = "https://search.nixos.org/options?query={searchTerms}";
|
||||||
|
IconURL = "https://wiki.nixos.org/favicon.ico";
|
||||||
|
Alias = "@no";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
Name = "NixOS Wiki";
|
||||||
|
URLTemplate = "https://wiki.nixos.org/w/index.php?search={searchTerms}";
|
||||||
|
IconURL = "https://wiki.nixos.org/favicon.ico";
|
||||||
|
Alias = "@nw";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
Name = "noogle";
|
||||||
|
URLTemplate = "https://noogle.dev/q?term={searchTerms}";
|
||||||
|
IconURL = "https://noogle.dev/favicon.ico";
|
||||||
|
Alias = "@ng";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
)
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
home.packages = with pkgs; [ zoom-us ];
|
home.packages = with pkgs; [ zoom-us ];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
dotDir = "${config.xdg.configHome}/zsh";
|
dotDir = "${config.xdg.configHome}/zsh";
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
update = "sudo nixos-rebuild switch";
|
update = "sudo nixos-rebuild switch";
|
||||||
|
bambo-studio = "flatpak run com.bambulab.BambuStudio";
|
||||||
};
|
};
|
||||||
autosuggestion.enable = true;
|
autosuggestion.enable = true;
|
||||||
localVariables = {
|
localVariables = {
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ in
|
|||||||
enableNushellIntegration = true;
|
enableNushellIntegration = true;
|
||||||
defaultCacheTtl = 60;
|
defaultCacheTtl = 60;
|
||||||
maxCacheTtl = 120;
|
maxCacheTtl = 120;
|
||||||
enableSshSupport = true;
|
# enableSshSupport = true;
|
||||||
sshKeys = [ "8E42E6C65D5F9894CFFF294851AB0CEB5F0B1FAA" ];
|
sshKeys = [ "8E42E6C65D5F9894CFFF294851AB0CEB5F0B1FAA" ];
|
||||||
pinentry.package = pkgs.pinentry-gnome3;
|
pinentry.package = pkgs.pinentry-gnome3;
|
||||||
# under extraConfig
|
# under extraConfig
|
||||||
|
|||||||
Reference in New Issue
Block a user