Uninstall Sway

4 files changed, 2 insertions, 297 deletions

diff --git a/aisaka.org b/aisaka.org
index c7ff4b4..f4f7e20 100644
--- a/aisaka.org
+++ b/aisaka.org
@@ -96,8 +96,7 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
     #:use-module (gnu packages)
     #:use-module (gnu services)
     #:use-module (guix gexp)
-    #:use-module (ssh-server)
-    #:use-module (sway))
+    #:use-module (ssh-server))
 
   (define allow-downgrades
     "--allow-downgrades ")
@@ -201,8 +200,6 @@ https://guix.gnu.org/en/manual/devel/en/html_node/Home-Configuration.html
    (services
     `(,<<flashrom-package>>
       ,ssh-configuration
-      ,sway-configuration
-      ,sway-packages
       ,(service home-bash-service-type
                 (home-bash-configuration
                  (environment-variables '(("EDITOR" . "emacs -nw")
@@ -342,50 +339,3 @@ memory without overprovisioning, as well as to prolog the lifetime of SSD.
 * TODO Device Management
 ** TODO Trezor
 
-* TODO Desktop Environment
-
-Sway is the currently chosen operating environment.
-
-** TODO Sway Window Manager
-
-The Sway Window Manager consists of Sway packages and relevant configurations.
-
-#+begin_src scheme :noweb-ref sway :tangle services/sway.scm
-  (add-to-load-path "./services")
-
-  (define-module (sway)
-    #:use-module (gnu)
-    #:use-module (gnu home)
-    #:use-module (gnu home services)
-    #:use-module (gnu home services shells))
-
-  <<sway-packages>>
-
-  <<sway-configuration>>
-#+end_src
-
-*** TODO Sway Installation
-
-#+begin_src scheme :noweb-ref sway-packages
-  (define-public sway-packages
-    (service
-     (service-type
-      (name 'sway-packages)
-      (extensions
-       `(,(service-extension home-profile-service-type
-			     (lambda (_)
-			       (map specification->package
-				    '("sway"
-				      "waybar"))))))
-      (description "Sway Window Manager installation.")
-      (default-value #f))))
-#+end_src
-
-*** TODO Sway configuration
-
-#+begin_src scheme :noweb-ref sway-configuration
-  (define-public sway-configuration
-    (simple-service 'configuration-files home-files-service-type
-		    `((".config/sway/config" ,(local-file "../sway.config"))
-		      (".config/waybar/config" ,(local-file "../waybar.config")))))
-#+end_src
diff --git a/home-configuration.scm b/home-configuration.scm
index a7020ab..83b220a 100644
--- a/home-configuration.scm
+++ b/home-configuration.scm
@@ -7,8 +7,7 @@
   #:use-module (gnu packages)
   #:use-module (gnu services)
   #:use-module (guix gexp)
-  #:use-module (ssh-server)
-  #:use-module (sway))
+  #:use-module (ssh-server))
 
 (define allow-downgrades
   "--allow-downgrades ")
@@ -121,8 +120,6 @@
   (description "Flashrom installation.")
   (default-value #f)))
     ,ssh-configuration
-    ,sway-configuration
-    ,sway-packages
     ,(service home-bash-service-type
               (home-bash-configuration
                (environment-variables '(("EDITOR" . "emacs -nw")
diff --git a/services/sway.scm b/services/sway.scm
deleted file mode 100644
index 3e11867..0000000
--- a/services/sway.scm
+++ /dev/null
@@ -1,25 +0,0 @@
-(add-to-load-path "./services")
-
-(define-module (sway)
-  #:use-module (gnu)
-  #:use-module (gnu home)
-  #:use-module (gnu home services)
-  #:use-module (gnu home services shells))
-
-(define-public sway-packages
-  (service
-   (service-type
-    (name 'sway-packages)
-    (extensions
-     `(,(service-extension home-profile-service-type
-			   (lambda (_)
-			     (map specification->package
-				  '("sway"
-				    "waybar"))))))
-    (description "Sway Window Manager installation.")
-    (default-value #f))))
-
-(define-public sway-configuration
-  (simple-service 'configuration-files home-files-service-type
-		  `((".config/sway/config" ,(local-file "../sway.config"))
-		    (".config/waybar/config" ,(local-file "../waybar.config")))))
diff --git a/sway.config b/sway.config
deleted file mode 100644
index 32c1496..0000000
--- a/sway.config
+++ /dev/null
@@ -1,217 +0,0 @@
-# Default config for sway
-#
-# Copy this to ~/.config/sway/config and edit it to your liking.
-#
-# Read `man 5 sway` for a complete reference.
-
-### Variables
-#
-# Logo key. Use Mod1 for Alt.
-set $mod Mod4
-# Home row direction keys, like vim
-set $left h
-set $down j
-set $up k
-set $right l
-# Your preferred terminal emulator
-set $term alacritty
-# Your preferred application launcher
-# Note: pass the final command to swaymsg so that the resulting window can be opened
-# on the original workspace that the command was run on.
-set $menu dmenu_path | dmenu | xargs swaymsg exec --
-
-### Output configuration
-#
-# Default wallpaper (more resolutions are available in /gnu/store/r1s30d4xxfx9a5i9m0rfa9kcnh02s0vs-sway-1.8-rc1/share/backgrounds/sway/)
-# output * bg /gnu/store/r1s30d4xxfx9a5i9m0rfa9kcnh02s0vs-sway-1.8-rc1/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
-#
-# Example configuration:
-#
-#   output HDMI-A-1 resolution 1920x1080 position 1920,0
-#
-# You can get the names of your outputs by running: swaymsg -t get_outputs
-
-### Idle configuration
-#
-# Example configuration:
-#
-# exec swayidle -w \
-#          timeout 300 'swaylock -f -c 000000' \
-#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
-#          before-sleep 'swaylock -f -c 000000'
-#
-# This will lock your screen after 300 seconds of inactivity, then turn off
-# your displays after another 300 seconds, and turn your screens back on when
-# resumed. It will also lock your screen before your computer goes to sleep.
-
-### Input configuration
-#
-# Example configuration:
-#
-#   input "2:14:SynPS/2_Synaptics_TouchPad" {
-#       dwt enabled
-#       tap enabled
-#       natural_scroll enabled
-#       middle_emulation enabled
-#   }
-#
-# You can get the names of your inputs by running: swaymsg -t get_inputs
-# Read `man 5 sway-input` for more information about this section.
-
-input type:keyboard xkb_layout pl
-
-input "2:10:TPPS/2_IBM_TrackPoint" scroll_factor 0.1
-
-input type:pointer
-      {
-      accel_profile flat
-      natural_scroll enabled
-      pointer_accel 0.3
-      }
-
-### Key bindings
-#
-# Basics:
-#
-    # Start a terminal
-    bindsym $mod+Return exec $term
-
-    # Kill focused window
-    bindsym $mod+Shift+q kill
-
-    # Start your launcher
-    bindsym $mod+d exec $menu
-
-    # Drag floating windows by holding down $mod and left mouse button.
-    # Resize them with right mouse button + $mod.
-    # Despite the name, also works for non-floating windows.
-    # Change normal to inverse to use left mouse button for resizing and right
-    # mouse button for dragging.
-    floating_modifier $mod normal
-
-    # Reload the configuration file
-    bindsym $mod+Shift+c reload
-
-    # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+e exit
-    #bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
-#
-# Moving around:
-#
-    # Move your focus around
-    bindsym $mod+$left focus left
-    bindsym $mod+$down focus down
-    bindsym $mod+$up focus up
-    bindsym $mod+$right focus right
-    # Or use $mod+[up|down|left|right]
-    bindsym $mod+Left focus left
-    bindsym $mod+Down focus down
-    bindsym $mod+Up focus up
-    bindsym $mod+Right focus right
-
-    # Move the focused window with the same, but add Shift
-    bindsym $mod+Shift+$left move left
-    bindsym $mod+Shift+$down move down
-    bindsym $mod+Shift+$up move up
-    bindsym $mod+Shift+$right move right
-    # Ditto, with arrow keys
-    bindsym $mod+Shift+Left move left
-    bindsym $mod+Shift+Down move down
-    bindsym $mod+Shift+Up move up
-    bindsym $mod+Shift+Right move right
-#
-# Workspaces:
-#
-    # Switch to workspace
-    bindsym $mod+1 workspace number 1
-    bindsym $mod+2 workspace number 2
-    bindsym $mod+3 workspace number 3
-    bindsym $mod+4 workspace number 4
-    bindsym $mod+5 workspace number 5
-    bindsym $mod+6 workspace number 6
-    bindsym $mod+7 workspace number 7
-    bindsym $mod+8 workspace number 8
-    bindsym $mod+9 workspace number 9
-    bindsym $mod+0 workspace number 10
-    # Move focused container to workspace
-    bindsym $mod+Shift+1 move container to workspace number 1
-    bindsym $mod+Shift+2 move container to workspace number 2
-    bindsym $mod+Shift+3 move container to workspace number 3
-    bindsym $mod+Shift+4 move container to workspace number 4
-    bindsym $mod+Shift+5 move container to workspace number 5
-    bindsym $mod+Shift+6 move container to workspace number 6
-    bindsym $mod+Shift+7 move container to workspace number 7
-    bindsym $mod+Shift+8 move container to workspace number 8
-    bindsym $mod+Shift+9 move container to workspace number 9
-    bindsym $mod+Shift+0 move container to workspace number 10
-    # Note: workspaces can have any name you want, not just numbers.
-    # We just use 1-10 as the default.
-#
-# Layout stuff:
-#
-    # You can "split" the current object of your focus with
-    # $mod+b or $mod+v, for horizontal and vertical splits
-    # respectively.
-    bindsym $mod+b splith
-    bindsym $mod+v splitv
-
-    # Switch the current container between different layout styles
-    bindsym $mod+s layout stacking
-    bindsym $mod+w layout tabbed
-    bindsym $mod+e layout toggle split
-
-    # Make the current focus fullscreen
-    bindsym $mod+f fullscreen
-
-    # Toggle the current focus between tiling and floating mode
-    bindsym $mod+Shift+space floating toggle
-
-    # Swap focus between the tiling area and the floating area
-    bindsym $mod+space focus mode_toggle
-
-    # Move focus to the parent container
-    bindsym $mod+a focus parent
-#
-# Scratchpad:
-#
-    # Sway has a "scratchpad", which is a bag of holding for windows.
-    # You can send windows there and get them back later.
-
-    # Move the currently focused window to the scratchpad
-    bindsym $mod+Shift+minus move scratchpad
-
-    # Show the next scratchpad window or hide the focused scratchpad window.
-    # If there are multiple scratchpad windows, this command cycles through them.
-    bindsym $mod+minus scratchpad show
-#
-# Resizing containers:
-#
-mode "resize" {
-    # left will shrink the containers width
-    # right will grow the containers width
-    # up will shrink the containers height
-    # down will grow the containers height
-    bindsym $left resize shrink width 10px
-    bindsym $down resize grow height 10px
-    bindsym $up resize shrink height 10px
-    bindsym $right resize grow width 10px
-
-    # Ditto, with arrow keys
-    bindsym Left resize shrink width 10px
-    bindsym Down resize grow height 10px
-    bindsym Up resize shrink height 10px
-    bindsym Right resize grow width 10px
-
-    # Return to default mode
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-bindsym $mod+r mode "resize"
-
-#
-# Status Bar:
-#
-# Read `man 5 sway-bar` for more information about this section.
-bar swaybar_command waybar
-
-# include /gnu/store/r1s30d4xxfx9a5i9m0rfa9kcnh02s0vs-sway-1.8-rc1/etc/sway/config.d/*