Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed hyprland.conf to main.conf

Browse Source
This commit is contained in:
blacknull
2024-10-18 09:30:08 -05:00
parent 42b3bcbfa8
commit 29a01705c3
6 changed files with 72 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
flake.lock generated
View File

@@ -7,11 +7,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-16SMbNTMTa+acgZVO0MihmuQonvLo4Oy24fSzNvBKLw=", "narHash": "sha256-16SMbNTMTa+acgZVO0MihmuQonvLo4Oy24fSzNvBKLw=",
"path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/ags", "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/ags",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/ags", "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/ags",
"type": "path" "type": "path"
} }
}, },
@@ -663,12 +663,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-mvMz5jI6JBR001HbqGw+/ZYu/hr4PkC1DpnEQUGNFfg=", "narHash": "sha256-FbSB/VPF1F8BjjGejCs9hzRK4uo5RNMoIdMdl58mEFM=",
"path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/hyprland", "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/hyprland",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/hyprland", "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/hyprland",
"type": "path" "type": "path"
} }
}, },
@@ -1058,12 +1058,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-rIcx3+cmbVFEMeLA+BmaC3iQNG9BOjY+stAzHVOJVH8=", "narHash": "sha256-IonQU9emwId8YSY5LwpXoNeK49y8RXZ3w54830/1ylE=",
"path": "/nix/store/f4fmriavc93pa0yjrjnppnvjd2wh1wfk-source/home", "path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/home",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/f4fmriavc93pa0yjrjnppnvjd2wh1wfk-source/home", "path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/home",
"type": "path" "type": "path"
} }
}, },
@@ -1434,11 +1434,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-B01IL6PFTcOaiaVsj3GnvmKb1Mc+PsajyoBSU7UE9zU=", "narHash": "sha256-B01IL6PFTcOaiaVsj3GnvmKb1Mc+PsajyoBSU7UE9zU=",
"path": "/nix/store/km3pmkm1y5wrx48pz1vqxa3ga9r99cjg-source/packages", "path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/packages",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/km3pmkm1y5wrx48pz1vqxa3ga9r99cjg-source/packages", "path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/packages",
"type": "path" "type": "path"
} }
}, },
@@ -1522,12 +1522,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-LHH1D2PB2ZAmHDkxaJtWGbDKZR78IKz/akc7fO6RMQg=", "narHash": "sha256-9L+1TDE6MNQVXd8Z869oLwjS3khchgAhhG+KCjPo4jc=",
"path": "/nix/store/km3pmkm1y5wrx48pz1vqxa3ga9r99cjg-source/programs", "path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/programs",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/km3pmkm1y5wrx48pz1vqxa3ga9r99cjg-source/programs", "path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/programs",
"type": "path" "type": "path"
} }
}, },
@@ -1556,12 +1556,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-EVhBDAt1miiP7BA3SooJNTCm0pESsl4VlRYCDSMutFY=", "narHash": "sha256-pqaq1rt9VZUm7XhlyQn7IH/+9vpAK/KUq2J7FlGs+dE=",
"path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/pywal", "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/pywal",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/pywal", "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/pywal",
"type": "path" "type": "path"
} }
}, },
@@ -1585,11 +1585,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-TsMqdRC5Rsop/6ASLtAFJc0Spt9NI8iQBk6dXxJ8mYA=", "narHash": "sha256-TsMqdRC5Rsop/6ASLtAFJc0Spt9NI8iQBk6dXxJ8mYA=",
"path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/rofi", "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/rofi",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/rofi", "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/rofi",
"type": "path" "type": "path"
} }
}, },
@@ -1689,11 +1689,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-XzsAbJgvL0qtbnVDmRizPn9j9SGeaz+QgUJMfLfRKvk=", "narHash": "sha256-XzsAbJgvL0qtbnVDmRizPn9j9SGeaz+QgUJMfLfRKvk=",
"path": "/nix/store/f4fmriavc93pa0yjrjnppnvjd2wh1wfk-source/system", "path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/system",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/f4fmriavc93pa0yjrjnppnvjd2wh1wfk-source/system", "path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/system",
"type": "path" "type": "path"
} }
}, },
@@ -1770,11 +1770,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-2h0M0hXa3L6rQJ2hmDadiZBYJcoxRqFdlXD7tK0LFrM=", "narHash": "sha256-2h0M0hXa3L6rQJ2hmDadiZBYJcoxRqFdlXD7tK0LFrM=",
"path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/terminal", "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/terminal",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/terminal", "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/terminal",
"type": "path" "type": "path"
} }
}, },

13
home/dotfiles/default.nix
View File

@@ -18,8 +18,7 @@
"ags/wifi.js" "ags/wifi.js"
"ags/workspaces.js" "ags/workspaces.js"
]; ];
in builtins.map (name: { ".config/${name}" = "./${name}"; }) files; in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files));
}) })
(lib.mkIf config.homeconfig.hyprland.enable { (lib.mkIf config.homeconfig.hyprland.enable {
@@ -27,9 +26,9 @@
files = [ files = [
"hypr/otf.conf" "hypr/otf.conf"
"hypr/pyprland.toml" "hypr/pyprland.toml"
"hypr/hyprland.conf" "hypr/main.conf"
]; ];
in builtins.map (name: { ".config/${name}" = "./${name}"; }) files; in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files));
}) })
(lib.mkIf config.homeconfig.swaylock.enable { (lib.mkIf config.homeconfig.swaylock.enable {
@@ -37,8 +36,7 @@
files = [ files = [
"swaylock/config" "swaylock/config"
]; ];
in builtins.map (name: { ".config/${name}" = "./${name}"; }) files; in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files));
}) })
(lib.mkIf config.homeconfig.wal.enable { (lib.mkIf config.homeconfig.wal.enable {
@@ -49,8 +47,7 @@
"wal/templates/colors-discord.css" "wal/templates/colors-discord.css"
"wal/templates/colors-hypr.conf" "wal/templates/colors-hypr.conf"
]; ];
in builtins.map (name: { ".config/${name}" = "./${name}"; }) files; in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files));
}) })
]; ];
} }

0
home/dotfiles/hypr/hyprland.conf → home/dotfiles/hypr/main.conf
View File

4
home/programs/hyprland/flake.nix
View File

@@ -30,6 +30,10 @@
systemd.variables = [ "--all" ]; systemd.variables = [ "--all" ];
extraConfig = ''
source = ./main.conf
'';
}; };
}; };

8
home/programs/pywal/flake.nix
View File

@@ -41,6 +41,13 @@
inputs.spicetify-nix.homeManagerModules.default inputs.spicetify-nix.homeManagerModules.default
]; ];
options.homeconfig.wal.enable = lib.options.mkOption {
type = lib.types.bool;
default = false;
};
config = lib.mkIf config.homeconfig.wal.enable {
programs.spicetify = let programs.spicetify = let
spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
in { in {
@@ -76,6 +83,7 @@
(lib.readFile "${pkgs.pywalfox-native}/lib/python3.11/site-packages/pywalfox/assets/manifest.json"); (lib.readFile "${pkgs.pywalfox-native}/lib/python3.11/site-packages/pywalfox/assets/manifest.json");
}; };
};
}; };
} }

2
home/programs/swaylock/default.nix
View File

@@ -7,6 +7,6 @@
config = lib.mkIf config.homeconfig.swaylock.enable { config = lib.mkIf config.homeconfig.swaylock.enable {
home.Packages = with pkgs; [ swaylock-effects ]; home.packages = with pkgs; [ swaylock-effects ];
}; };
} }