diff --git a/home/default.nix b/home/default.nix index e0065d3..1f43229 100644 --- a/home/default.nix +++ b/home/default.nix @@ -13,7 +13,7 @@ ./programs/terminal/bottom.nix ./programs/terminal/starship.nix ./programs/terminal/zoxide.nix - ./programs/direnv.nix + ./programs/terminal/direnv.nix ./programs/git.nix ]; @@ -39,6 +39,7 @@ unrar p7zip procs + # atac ]; stateVersion = "23.05"; }; diff --git a/home/profiles/ame/default.nix b/home/profiles/ame/default.nix index 1e357b0..a29ea66 100644 --- a/home/profiles/ame/default.nix +++ b/home/profiles/ame/default.nix @@ -1,15 +1,9 @@ { - inputs, pkgs, ... }: { imports = [ - inputs.hyprland.homeManagerModules.default - inputs.anyrun.homeManagerModules.default - inputs.ags.homeManagerModules.default - inputs.nix-index-database.hmModules.nix-index ../../services - ../../programs/ags ../../programs/anyrun ../../programs/browsers/firefox ../../programs/browsers/chromium diff --git a/home/profiles/default.nix b/home/profiles/default.nix index 32a3dd6..8350b67 100644 --- a/home/profiles/default.nix +++ b/home/profiles/default.nix @@ -1,7 +1,7 @@ # stolen from fufexan { - self, inputs, + self, ... }: let extraSpecialArgs = {inherit inputs self;}; diff --git a/home/profiles/default/default.nix b/home/profiles/default/default.nix index f7e9be4..70dec76 100644 --- a/home/profiles/default/default.nix +++ b/home/profiles/default/default.nix @@ -1,4 +1,3 @@ { - imports = [ - ]; + imports = []; } diff --git a/home/profiles/tsuki/default.nix b/home/profiles/tsuki/default.nix index 6534a85..8981892 100644 --- a/home/profiles/tsuki/default.nix +++ b/home/profiles/tsuki/default.nix @@ -4,18 +4,10 @@ ... }: { imports = [ - inputs.hyprland.homeManagerModules.default - inputs.anyrun.homeManagerModules.default - inputs.ags.homeManagerModules.default - inputs.hypridle.homeManagerModules.default - inputs.hyprlock.homeManagerModules.default - inputs.hyprpaper.homeManagerModules.default - inputs.nix-index-database.hmModules.nix-index ../../services - ../../programs/ags ../../programs/anyrun + ../../programs/ironbar ../../programs/browsers/firefox - ../../programs/browsers/chromium ../../programs/terminal/wezterm ../../programs/terminal/zellij ../../programs/gtk.nix @@ -37,11 +29,8 @@ pavucontrol anki-bin tomato-c - distrobox - gpg-tui vscode-fhs obsidian-wayland - jellyfin-mpv-shim virt-manager qbittorrent hyprpicker @@ -53,14 +42,10 @@ cryptomator ventoy-bin-full wine - lutris - mangohud bottles prismlauncher - stellarium inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin - (libsForQt5.callPackage ../../../pkgs/chatterino7 {}) - (callPackage ../../../pkgs/jellyfin-rpc {}) + (callPackage ../../../pkgs/chatterino7 {}) ]; programs.ssh = { diff --git a/home/programs/ags/config/.eslintrc.js b/home/programs/ags/config/.eslintrc.js deleted file mode 100644 index 434c80b..0000000 --- a/home/programs/ags/config/.eslintrc.js +++ /dev/null @@ -1,25 +0,0 @@ -module.exports = { - env: { - browser: true, - es2021: true - }, - extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"], - overrides: [ - { - env: { - node: true - }, - files: [".eslintrc.{js,cjs}"], - parserOptions: { - sourceType: "script" - } - } - ], - parser: "@typescript-eslint/parser", - parserOptions: { - ecmaVersion: "latest", - sourceType: "module" - }, - plugins: ["@typescript-eslint"], - rules: {} -}; diff --git a/home/programs/ags/config/.gitignore b/home/programs/ags/config/.gitignore deleted file mode 100644 index ded35cd..0000000 --- a/home/programs/ags/config/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -style.css -style.css.map \ No newline at end of file diff --git a/home/programs/ags/config/.prettierrc.json b/home/programs/ags/config/.prettierrc.json deleted file mode 100644 index 36b3563..0000000 --- a/home/programs/ags/config/.prettierrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "trailingComma": "none" -} diff --git a/home/programs/ags/config/config.js b/home/programs/ags/config/config.js deleted file mode 100644 index 051b017..0000000 --- a/home/programs/ags/config/config.js +++ /dev/null @@ -1,21 +0,0 @@ -const entry = App.configDir + "/ts/main.ts"; -const outdir = "/tmp/ags/js"; - -try { - await Utils.execAsync([ - "bun", - "build", - entry, - "--outdir", - outdir, - "--external", - "resource://*", - "--external", - "gi://*" - ]); - await import(`file://${outdir}/main.js`); -} catch (error) { - console.error(error); -} - -export {}; diff --git a/home/programs/ags/config/main.scss b/home/programs/ags/config/main.scss deleted file mode 100644 index a6a50ec..0000000 --- a/home/programs/ags/config/main.scss +++ /dev/null @@ -1 +0,0 @@ -@import "./style/main.scss"; diff --git a/home/programs/ags/config/package-lock.json b/home/programs/ags/config/package-lock.json deleted file mode 100644 index 9ea904e..0000000 --- a/home/programs/ags/config/package-lock.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "snowflake-ags", - "version": "0.0.1", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "snowflake-ags", - "version": "0.0.1", - "license": "MIT" - } - } -} diff --git a/home/programs/ags/config/package.json b/home/programs/ags/config/package.json deleted file mode 100644 index e6a3131..0000000 --- a/home/programs/ags/config/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "snowflake-ags", - "version": "0.0.1", - "description": "", - "main": "config.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "notohh", - "license": "MIT" -} diff --git a/home/programs/ags/config/style/style.scss b/home/programs/ags/config/style/style.scss deleted file mode 100644 index dfa57df..0000000 --- a/home/programs/ags/config/style/style.scss +++ /dev/null @@ -1,7 +0,0 @@ -* { - all: unset; -} - -window { - background: black; -} diff --git a/home/programs/ags/config/ts/main.ts b/home/programs/ags/config/ts/main.ts deleted file mode 100644 index 9543eba..0000000 --- a/home/programs/ags/config/ts/main.ts +++ /dev/null @@ -1,48 +0,0 @@ -const scss = App.configDir + "/main.scss"; -const css = App.configDir + "/style.css"; - -const time = Variable("", { - poll: [ - 1000, - function () { - return Date().toString(); - } - ] -}); - -Utils.monitorFile( - `${App.configDir}/style`, - - function () { - const scss = `${App.configDir}/main.scss`; - - const css = `./style.css`; - - Utils.exec(`sass ${scss} ${css}`); - App.resetCss(); - App.applyCss(css); - } -); - -const Bar = (monitor: number) => - Widget.Window({ - monitor, - name: `bar${monitor}`, - anchor: ["top", "left", "right"], - exclusivity: "exclusive", - child: Widget.CenterBox({ - start_widget: Widget.Label({ - hpack: "center", - label: "Welcome to AGS!" - }), - end_widget: Widget.Label({ - hpack: "center", - label: time.bind() - }) - }) - }); - -App.config({ - style: css, - windows: [Bar(2)] -}); diff --git a/home/programs/ags/config/tsconfig.json b/home/programs/ags/config/tsconfig.json deleted file mode 100644 index 2d1a810..0000000 --- a/home/programs/ags/config/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "compilerOptions": { - "target": "ES2022", - "module": "ES2022", - "lib": ["ES2022"], - "allowJs": true, - "checkJs": true, - "strict": true, - "noImplicitAny": false, - "baseUrl": ".", - "typeRoots": ["./types"], - "skipLibCheck": true - } -} diff --git a/home/programs/ags/config/types b/home/programs/ags/config/types deleted file mode 120000 index 531afdb..0000000 --- a/home/programs/ags/config/types +++ /dev/null @@ -1 +0,0 @@ -/home/notoh/.local/share/com.github.Aylur.ags/types \ No newline at end of file diff --git a/home/programs/ags/default.nix b/home/programs/ags/default.nix deleted file mode 100644 index cb27f65..0000000 --- a/home/programs/ags/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ - pkgs, - config, - ... -}: let - configDir = "/home/notoh/snowflake/home/programs/ags/config"; -in { - programs.ags = { - enable = true; - extraPackages = with pkgs; [libsoup_3 libdbusmenu-gtk3]; - }; - home.packages = with pkgs; [dart-sass bun]; - xdg.configFile = { - "ags".source = config.lib.file.mkOutOfStoreSymlink "${configDir}"; - }; -} diff --git a/home/programs/anyrun/default.nix b/home/programs/anyrun/default.nix index cff9638..0006bd0 100644 --- a/home/programs/anyrun/default.nix +++ b/home/programs/anyrun/default.nix @@ -9,6 +9,8 @@ ${lib.getExe pkgs.sassc} -t expanded '${source}' > $out/${name}.css ''}/${name}.css"; in { + imports = [inputs.anyrun.homeManagerModules.default]; + programs.anyrun = { enable = true; config = { diff --git a/home/programs/ironbar/config.nix b/home/programs/ironbar/config.nix new file mode 100644 index 0000000..3bcd278 --- /dev/null +++ b/home/programs/ironbar/config.nix @@ -0,0 +1,28 @@ +_: { + programs.ironbar.config = let + nixlogo = rec { + type = "custom"; + name = "nixlogo"; + class = name; + bar = [ + { + type = "image"; + src = "https://files.artturin.com/files/nixoscolorful.svg"; + size = 24; + } + ]; + }; + tray = {type = "tray";}; + clock = {type = "clock";}; + in { + monitors = { + "DP-2" = { + position = "top"; + anchor_to_edges = true; + start = [nixlogo]; + center = []; + end = [clock tray]; + }; + }; + }; +} diff --git a/home/programs/ironbar/default.nix b/home/programs/ironbar/default.nix new file mode 100644 index 0000000..d0da905 --- /dev/null +++ b/home/programs/ironbar/default.nix @@ -0,0 +1,19 @@ +{ + inputs, + pkgs, + lib, + ... +}: let + compileSCSS = name: source: "${pkgs.runCommandLocal name {} '' + mkdir -p $out + ${lib.getExe pkgs.sass} '${source}' > $out/${name}.css + ''}/${name}.css"; +in { + imports = [inputs.ironbar.homeManagerModules.default ./config.nix]; + + programs.ironbar = { + enable = true; + systemd = true; + style = builtins.readFile (compileSCSS "style" ./style.scss); + }; +} diff --git a/home/programs/ironbar/style.scss b/home/programs/ironbar/style.scss new file mode 100644 index 0000000..0726478 --- /dev/null +++ b/home/programs/ironbar/style.scss @@ -0,0 +1,3 @@ +* { + all: unset; +} diff --git a/home/programs/direnv.nix b/home/programs/terminal/direnv.nix similarity index 100% rename from home/programs/direnv.nix rename to home/programs/terminal/direnv.nix diff --git a/home/wayland/hyprland/config/plugins.nix b/home/wayland/hyprland/config/plugins.nix new file mode 100644 index 0000000..92f9014 --- /dev/null +++ b/home/wayland/hyprland/config/plugins.nix @@ -0,0 +1,19 @@ +{ + pkgs, + inputs, + ... +}: { + wayland.windowManager.hyprland.settings = { + plugins = [ + inputs.hyprland-plugins.packages.${pkgs.system}.hyprexpo + ]; + plugin = { + hyprexpo = { + columns = 3; + gap_size = 5; + bg_col = "rgb(111111)"; + workspace_method = "center current"; + }; + }; + }; +} diff --git a/home/wayland/hyprland/config/rules.nix b/home/wayland/hyprland/config/rules.nix index fb870f2..087e4fb 100644 --- a/home/wayland/hyprland/config/rules.nix +++ b/home/wayland/hyprland/config/rules.nix @@ -19,6 +19,7 @@ _: { ]; layerrule = [ "blur, ^(gtk-layer-shell|anyrun)$" + "blur, ^(gtk-layer-shell|ironbar)$" ]; }; } diff --git a/home/wayland/hyprland/default.nix b/home/wayland/hyprland/default.nix index 46fdcd7..a3a6282 100644 --- a/home/wayland/hyprland/default.nix +++ b/home/wayland/hyprland/default.nix @@ -1,8 +1,10 @@ -_: { +{inputs, ...}: { imports = [ + inputs.hyprland.homeManagerModules.default ./config/general.nix ./config/binds.nix ./config/rules.nix + # ./config/plugins.nix ]; wayland.windowManager.hyprland = { enable = true; diff --git a/home/wayland/programs/hyprlock.nix b/home/wayland/programs/hyprlock.nix index 116b763..4c28ea2 100644 --- a/home/wayland/programs/hyprlock.nix +++ b/home/wayland/programs/hyprlock.nix @@ -1,4 +1,5 @@ -_: { +{inputs, ...}: { + imports = [inputs.hyprlock.homeManagerModules.default]; programs.hyprlock = { enable = true; backgrounds = let diff --git a/home/wayland/services/greetd.nix b/home/wayland/services/greetd.nix index a052737..03117ae 100644 --- a/home/wayland/services/greetd.nix +++ b/home/wayland/services/greetd.nix @@ -26,6 +26,7 @@ $mainMod = SUPER bind = $mainMod, Q, exec, reboot + bind = $mainMod, Return, exec, ${lib.getExe pkgs.greetd.regreet} input { kb_layout = us diff --git a/home/wayland/services/hypridle.nix b/home/wayland/services/hypridle.nix index 6800282..41c7e55 100644 --- a/home/wayland/services/hypridle.nix +++ b/home/wayland/services/hypridle.nix @@ -1,9 +1,11 @@ { + inputs, pkgs, - config, lib, + config, ... }: { + imports = [inputs.hypridle.homeManagerModules.default]; services.hypridle = { enable = true; ignoreDbusInhibit = false; diff --git a/home/wayland/services/hyprpaper.nix b/home/wayland/services/hyprpaper.nix index d950e68..1d39cd0 100644 --- a/home/wayland/services/hyprpaper.nix +++ b/home/wayland/services/hyprpaper.nix @@ -1,4 +1,5 @@ -_: { +{inputs, ...}: { + imports = [inputs.hyprpaper.homeManagerModules.default]; services.hyprpaper = { enable = true; ipc = true;