tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

zenix: fixes to cosmic exp hm module and git bclone opt passthru

Browse source
This commit is contained in:
tristan 2024-10-06 22:36:53 +01:00
parent cdd2897470
commit 9c6e2ac6bf
4 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated
View file

@ -304,18 +304,14 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1728079598, "lastModified": 1728249206,
"narHash": "sha256-RUOZKSntxbTN7seIzq9oGNgh3LP00CDtspEDVyuD1hM=", "narHash": "sha256-p/ntQwqm0zA/HnitCL8UrzMuC8mjUDr7LEu/f3XiWsU=",
"owner": "tristanbeedell", "path": "/home/tristan/Documents/code/home-manager/cosmic",
"repo": "home-manager", "type": "path"
"rev": "faf69fb8d9690429cc1d55ae39c5c40cdded71ff",
"type": "github"
}, },
"original": { "original": {
"owner": "tristanbeedell", "path": "/home/tristan/Documents/code/home-manager/cosmic",
"ref": "cosmic", "type": "path"
"repo": "home-manager",
"type": "github"
} }
}, },
"home-manager_2": { "home-manager_2": {

2
flake.nix
View file

@ -6,7 +6,7 @@
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager-cosmic.url = "github:tristanbeedell/home-manager/cosmic"; home-manager-cosmic.url = "path:///home/tristan/Documents/code/home-manager/cosmic";
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
nixos-cosmic = { nixos-cosmic = {

39
home/desktop/cosmic/default.nix
View file

@ -3,7 +3,7 @@
in { in {
programs.cosmic = { programs.cosmic = {
enable = true; enable = true;
input.defaultKeybindings = false; input.asDefaults = true;
input.binds = { input.binds = {
# Navigation # Navigation
Super. "h" = (Actions.Focus "Left"); Super. "h" = (Actions.Focus "Left");
@ -34,7 +34,7 @@ in {
Super. "d" = (Actions.Spawn config.programs.menu.drunCommand); Super. "d" = (Actions.Spawn config.programs.menu.drunCommand);
Super. "Return" = (Actions.Spawn pkgs.alacritty); Super. "Return" = (Actions.Spawn pkgs.alacritty);
Super. "o" = (Actions.System "HomeFolder"); Super. "o" = (Actions.System "HomeFolder");
Super.Shift. "s" = (Actions.Spawn "cosmic-screenshot"); Super.Shift. "s" = (Actions.System "Screenshot");
}; };
background = { background = {
displays = { displays = {
@ -43,21 +43,26 @@ in {
}; };
}; };
}; };
# panels = { panels = {
# Panel = { "Bar" = {
# applets = { applets = {
# start = [ "com.system76.CosmicAppletWorkspaces" ]; start = [ "com.system76.CosmicAppletWorkspaces" ];
# center = [ "com.system76.CosmicAppList" ]; center = [ "com.system76.CosmicAppList" ];
# end = [ end = [
# "com.system76.CosmicAppletTime" "com.system76.CosmicAppletTime"
# "com.system76.CosmicAppletAudio" "com.system76.CosmicAppletTiling"
# "com.system76.CosmicAppletNotifications" "com.system76.CosmicAppletAudio"
# "com.system76.CosmicAppletMinimize" "com.system76.CosmicAppletNotifications"
# "com.system76.CosmicAppletPower" "com.system76.CosmicAppletMinimize"
# ]; "com.system76.CosmicAppletPower"
# }; ];
# }; };
# }; options = {
size = "XS";
border_radius = 0;
};
};
};
settings = { settings = {
"com.system76.CosmicComp".options = { "com.system76.CosmicComp".options = {
autotile = true; autotile = true;

13
home/programs/git.nix
View file

@ -9,11 +9,18 @@
bclone = "!sh ${pkgs.writeShellScriptBin "bare-clone" '' bclone = "!sh ${pkgs.writeShellScriptBin "bare-clone" ''
url=$1 url=$1
basename=''${url##*/} basename=''${url##*/}
name=''${2:-''${basename%.*}} if [[ $2 == -* ]]
then
opts=''${@:2}
name=''${basename%.*}
else
opts=''${@:3}
name=''${2:-''${basename%.*}}
fi
mkdir "$name" mkdir "$name"
git clone --bare "$url" "$name/.bare" || { git clone --bare "$url" "$name/.bare" $opts || {
rm -r "$name" rm -r "$name"
exit 1 exit 1
} }
@ -23,7 +30,7 @@
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
git fetch origin git fetch origin $opts
''}/bin/bare-clone"; ''}/bin/bare-clone";
}; };
delta = { delta = {