move more into flake

6 files changed, 46 insertions, 45 deletions

diff --git a/nixos/.flake/home/.wallpaper b/nixos/.flake/home/.wallpaper
new file mode 120000
index 0000000..316db81
--- /dev/null
+++ b/nixos/.flake/home/.wallpaper
@@ -0,0 +1 @@
+../../../common/.wallpaper
\ No newline at end of file
diff --git a/nixos/.flake/home/core.org b/nixos/.flake/home/core.org
index af108cf..0d578a8 100644
--- a/nixos/.flake/home/core.org
+++ b/nixos/.flake/home/core.org
@@ -10,11 +10,13 @@ Set up home manager for my user account and import submodules.
       ./fonts.nix
       ./hyprland.nix
       ./programs/core.nix
+      ./scripts.nix
       ./services/core.nix
     ];
 
     home.username = "jane";
     home.homeDirectory = "/home/jane";
+    home.file.".wallpaper".source = ./.wallpaper;
 
     home.stateVersion = "24.05";
     programs.home-manager.enable = true;
diff --git a/nixos/.flake/home/scripts.org b/nixos/.flake/home/scripts.org
new file mode 100644
index 0000000..b98b389
--- /dev/null
+++ b/nixos/.flake/home/scripts.org
@@ -0,0 +1,43 @@
+#+title: Custom Scripts
+
+Open script container.
+#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes
+  { config, pkgs, ... }:
+
+  {
+    home.file = {
+#+end_src
+
+Use =fuzzel= to open a menu to power off, reboot, or log out.
+#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes
+      ".local/bin/poweroptions.sh" = {
+        text = ''
+    #!/bin/sh
+
+    getoption () {
+        fuzzel --dmenu -l 3 -x 1 -r 10 << EOF
+            󰐥 power off
+            󰜉 restart
+            󰍃 logout
+    EOF
+    }
+
+    option=$(getoption | xargs)
+    case $option in
+        '󰐥 power off')
+            systemctl poweroff;;
+        '󰜉 restart')
+            systemctl reboot;;
+        '󰍃 logout')
+            hyprctl dispatch exit;;
+    esac
+        '';
+        executable = true;
+      };
+#+end_src
+
+Close script container.
+#+begin_src nix :tangle ~/.flake/home/scripts.nix :mkdirp yes
+    };
+  }
+#+end_src
diff --git a/nixos/.local/bin/poweroptions.org b/nixos/.local/bin/poweroptions.org
deleted file mode 100644
index 6f154ef..0000000
--- a/nixos/.local/bin/poweroptions.org
+++ /dev/null
@@ -1,24 +0,0 @@
-#+title: Power Options Script
-
-Use =fuzzel= to open a menu to power off, reboot, or log out.
-#+begin_src sh :tangle ~/.local/bin/poweroptions.sh :mkdirp yes :tangle-mode o755
-  #!/bin/sh
-
-  getoption () {
-      fuzzel --dmenu -l 3 -x 1 -r 10 << EOF
-          󰐥 power off
-          󰜉 restart
-          󰍃 logout
-  EOF
-  }
-
-  option=$(getoption | xargs)
-  case $option in
-      '󰐥 power off')
-          systemctl poweroff;;
-      '󰜉 restart')
-          systemctl reboot;;
-      '󰍃 logout')
-          hyprctl dispatch exit;;
-  esac
-#+end_src
diff --git a/nixos/.local/share/applications/emacs.org b/nixos/.local/share/applications/emacs.org
deleted file mode 100644
index 6eab52f..0000000
--- a/nixos/.local/share/applications/emacs.org
+++ /dev/null
@@ -1,20 +0,0 @@
-#+title: Emacs Desktop File
-This is a copy of the normal Emacs desktop file, but it launches with =emacsclient= instead of =emacs= to allow connecting to the Emacs daemon.
-#+begin_src desktop :tangle ~/.local/share/applications/emacs.desktop :mkdirp yes
-  [Desktop Entry]
-  Type=Application
-  Version=1.0
-  Name=GNU Emacs
-  GenericName=Emacs
-  Comment=Emacs is the extensible, customizable, self-documenting real-time display editor
-  Comment[de]=Emacs ist der erweiterbare, anpassbare, selbst-dokumentierende Echtzeit-Editor
-  Comment[es]=Emacs es un editor ampliable, adaptable, mismo documentado, de tiempo real
-  Comment[fr]=Emacs est l'éditeur plein écran avancé, auto-documenté, personnalisable et extensible
-  Icon=emacs
-  TryExec=/usr/bin/emacs
-  Exec=/usr/bin/emacsclient -c %F
-  Terminal=false
-  MimeType=text/css;text/english;text/html;text/plain;text/x-c;text/x-chdr;text/x-csrc;text/x-c++;text/x-c++hdr;text/x-c++src;text/x-java;text/x-makefile;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;
-  Categories=Development;TextEditor;
-  StartupWMClass=Emacs
-#+end_src
diff --git a/nixos/.wallpaper b/nixos/.wallpaper
deleted file mode 120000
index ec41b94..0000000
--- a/nixos/.wallpaper
+++ /dev/null
@@ -1 +0,0 @@
-../common/.wallpaper
\ No newline at end of file