josh
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: josh:691826fb1b7e05ee52b6a1f47d43fb9f80fbb54b
Branches Tags
josh:main
josh:home-manager
..
compare: josh:fdb7f1962a41f7f97912cdf4f38efc95a075235f
Branches Tags
josh:main
josh:home-manager

No commits in common. "691826fb1b7e05ee52b6a1f47d43fb9f80fbb54b" and "fdb7f1962a41f7f97912cdf4f38efc95a075235f" have entirely different histories.
691826fb1b ... fdb7f1962a

9 changed files with 7 additions and 142 deletions
Show Stats Expand all files Collapse all files

83
flake.lock
View File

@ -68,28 +68,6 @@
"type": "github" "type": "github"
} }
}, },
"elephant": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"systems": "systems"
},
"locked": {
"lastModified": 1769329000,
"narHash": "sha256-0vibWqmCsG1t4xL2euR6PScB3M4QZigB5JGl+BIH4NY=",
"owner": "abenz1267",
"repo": "elephant",
"rev": "1988112d1f54dd76e8a90f551945df763586bdad",
"type": "github"
},
"original": {
"owner": "abenz1267",
"ref": "master",
"repo": "elephant",
"type": "github"
}
},
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -262,13 +240,11 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"elephant": "elephant",
"home-manager": "home-manager", "home-manager": "home-manager",
"install-system": "install-system", "install-system": "install-system",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"stylix": "stylix", "stylix": "stylix"
"walker": "walker"
} }
}, },
"stylix": { "stylix": {
@ -284,7 +260,7 @@
"nixpkgs" "nixpkgs"
], ],
"nur": "nur", "nur": "nur",
"systems": "systems_2", "systems": "systems",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes", "tinted-schemes": "tinted-schemes",
@ -307,21 +283,6 @@
} }
}, },
"systems": { "systems": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"systems_2": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -336,21 +297,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"type": "github"
}
},
"tinted-foot": { "tinted-foot": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -431,31 +377,6 @@
"repo": "base16-zed", "repo": "base16-zed",
"type": "github" "type": "github"
} }
},
"walker": {
"inputs": {
"elephant": [
"elephant"
],
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_3"
},
"locked": {
"lastModified": 1769093508,
"narHash": "sha256-ccwJ1ADGNFd5LDF2JWdfP7+f1Hs2EvJ+2o6sUOdYi7w=",
"owner": "abenz1267",
"repo": "walker",
"rev": "e427025bdda667712b08dd56f1a0a23667f1364c",
"type": "github"
},
"original": {
"owner": "abenz1267",
"ref": "master",
"repo": "walker",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

14
flake.nix
View File

@ -7,29 +7,15 @@
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-vscode-extensions = { nix-vscode-extensions = {
url = "github:nix-community/nix-vscode-extensions"; url = "github:nix-community/nix-vscode-extensions";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
url = "github:danth/stylix/master"; url = "github:danth/stylix/master";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
elephant = {
url = "github:abenz1267/elephant/master";
inputs.nixpkgs.follows = "nixpkgs";
};
walker = {
url = "github:abenz1267/walker/master";
inputs = {
elephant.follows = "elephant";
nixpkgs.follows = "nixpkgs";
};
};
install-system = { install-system = {
url = "path:scripts/install-system"; url = "path:scripts/install-system";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

8
homes/josh/home.nix
View File

@ -36,14 +36,6 @@ with lib;
"nix-command" "nix-command"
"flakes" "flakes"
]; ];
extra-substituters = [
"https://walker.cachix.org"
"https://walker-git.cachix.org"
];
extra-trusted-public-keys = [
"walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM="
"walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="
];
}; };
}; };
} }

3
hosts/vm/default.nix
View File

@ -1,8 +1,10 @@
{ {
profile,
... ...
}: }:
{ {
imports = [ imports = [
../../profiles/${profile}
../../profiles/vm ../../profiles/vm
../../modules/core ../../modules/core
../../modules/options ../../modules/options
@ -14,7 +16,6 @@
modules.hyprland = { modules.hyprland = {
enable = true; enable = true;
terminal = "kitty"; terminal = "kitty";
launcher = "walker";
monitor = [ monitor = [
",preferred,auto,1" ",preferred,auto,1"
]; ];

1
modules/homes/default.nix
View File

@ -10,7 +10,6 @@
./overlays.nix ./overlays.nix
./stylix.nix ./stylix.nix
./vscodium.nix ./vscodium.nix
./walker.nix
./xdg.nix ./xdg.nix
./zsh ./zsh
]; ];

1
modules/homes/hyprland/binds.nix
View File

@ -11,7 +11,6 @@ in
bind = [ bind = [
# Misc # Misc
"$mod,Return,exec,${cfg.terminal}" "$mod,Return,exec,${cfg.terminal}"
"$mod,D,exec,walker"
# Window management # Window management
"$mod,C,killactive" "$mod,C,killactive"

11
modules/homes/hyprland/hyprland.nix
View File

@ -12,7 +12,8 @@ in
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = cfg.enable; enable = cfg.enable;
package = pkgs.hyprland; package = pkgs.hyprland;
systemd.enable = true; systemd.enable = false;
xwayland.enable = true;
settings = { settings = {
monitor = cfg.monitor; monitor = cfg.monitor;
@ -46,10 +47,6 @@ in
}; };
}; };
misc = {
initial_workspace_tracking = 2;
};
env = [ env = [
"NIXOS_OZONE_WL, 1" "NIXOS_OZONE_WL, 1"
"XDG_CURRENT_DESKTOP, Hyprland" "XDG_CURRENT_DESKTOP, Hyprland"
@ -57,10 +54,6 @@ in
"XDG_SESSION_TYPE, wayland" "XDG_SESSION_TYPE, wayland"
]; ];
xwayland = {
enabled = true;
};
ecosystem = { ecosystem = {
no_update_news = true; no_update_news = true;
}; };

17
modules/homes/walker.nix
View File

@ -1,17 +0,0 @@
{
config,
inputs,
lib,
...
}:
with lib;
let hyprlandCfg = config.modules.hyprland;
in
{
imports = [ inputs.walker.homeManagerModules.default ];
programs.walker = mkIf (hyprlandCfg.launcher == "walker") {
enable = true;
runAsService = true;
};
}

9
modules/options/hyprland.nix
View File

@ -19,15 +19,6 @@ with lib;
The terminal to use for Hyprland. The terminal to use for Hyprland.
''; '';
}; };
launcher = mkOption {
type = types.enum [
"walker"
];
default = "walker";
description = ''
The application launcher to use for Hyprland.
'';
};
monitor = mkOption { monitor = mkOption {
type = types.listOf types.str; type = types.listOf types.str;
default = [ ",preferred,auto,1" ]; default = [ ",preferred,auto,1" ];