diff --git a/Emacs/.#emacs.org b/Emacs/.#emacs.org
deleted file mode 120000
index d69e10e..0000000
--- a/Emacs/.#emacs.org
+++ /dev/null
@@ -1 +0,0 @@
-geir@work.7736:1736927584
\ No newline at end of file
diff --git a/Emacs/emacs.org b/Emacs/emacs.org
index 477fd3b..b859f5b 100644
--- a/Emacs/emacs.org
+++ b/Emacs/emacs.org
@@ -6,3 +6,4 @@
 * About
 My attempt at a litterate configuration for Emacs.
 
+
diff --git a/dotfiles/sway/config b/dotfiles/sway/config
new file mode 100644
index 0000000..cd70dfb
--- /dev/null
+++ b/dotfiles/sway/config
@@ -0,0 +1,208 @@
+default_border none
+  ### 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 kitty 
+
+  set $menu fuzzel
+  # Set gnome stuff
+  set $gnome-schema org.gnome.desktop.interface
+  ### Output configuration
+
+  #
+  # Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/)
+  output * bg /home/geir/Pictures/wall.jpg 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 1200 'swaylock -f -c 000000' \
+           timeout 36000 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+           before-sleep 'swaylock -f -c 000000'
+
+  # This will lock your screen after 600 seconds of inactivity, then turn off
+  # your displays after another 600 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 "type: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
+  # or input <identifier>
+input "type:keyboard" {
+  xkb_layout "us, no"
+  xkb_variant ,nodeadkeys
+  xkb_options "caps:ctrl_modifier, grp:win_space_toggle"
+
+}
+  # screenshots
+  bindsym $mod+c exec flameshot gui -p /home/geir/Pictures/Screenshots
+  ### 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.
+  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 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
+
+  #
+  # 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+ctrl+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:
+  #
+bar {
+   swaybar_command waybar 
+} 
+
+include /etc/sway/config.d/*
+exec dbus-sway-environment
+exec configure-gtk
+exec gammastep
diff --git a/dotfiles/waybar/config b/dotfiles/waybar/config
new file mode 100644
index 0000000..6952296
--- /dev/null
+++ b/dotfiles/waybar/config
@@ -0,0 +1,212 @@
+{
+   "layer": "top",
+   "position": "top",
+   "modules-left": [
+   "sway/mode",
+                      "sway/workspaces",
+                      "custom/arrow10",
+                      "sway/window"
+                      ],
+
+                      "modules-right": [
+                      "custom/arrow9",
+                      "pulseaudio",
+                      "custom/arrow8",
+                      "network",
+                      "custom/arrow7",
+                      "memory",
+                      "custom/arrow6",
+                      "cpu",
+                      "custom/arrow5",
+                      "temperature",
+                      "custom/arrow4",
+                      "battery",
+                      "custom/arrow3",
+                      "sway/language",
+                      "custom/arrow2",
+                      "tray",
+                      "clock#date",
+                      "custom/arrow1",
+                      "clock#time"
+                      ],
+
+                      // Modules
+
+                      "battery": {
+                               "interval": 10,
+                               "states": {
+                                         "warning": 30,
+                                         "critical": 15
+                                         },
+                                "format-time": "{H}:{M:02}",
+                                "format": "{icon} {capacity}% ({time})",
+                                "format-charging": " {capacity}% ({time})",
+                                "format-charging-full": " {capacity}%",
+                                "format-full": "{icon} {capacity}%",
+                                "format-alt": "{icon} {power}W",
+                                "format-icons": [
+                                        "",
+                                        "",
+                                        "",
+                                        "",
+                                        ""
+                                ],
+                                "tooltip": false
+                        },
+
+                        "clock#time": {
+                                "interval": 10,
+                                "format": "{:%H:%M}",
+                                "tooltip": false
+                        },
+
+                        "clock#date": {
+                                "interval": 20,
+                                "format": "{:%e %b %Y}",
+                                "tooltip": false
+                                //"tooltip-format": "{:%e %B %Y}"
+                        },
+
+                        "cpu": {
+                                "interval": 5,
+                                "tooltip": false,
+                                "format": " {usage}%",
+                                "format-alt": " {load}",
+                                "states": {
+                                        "warning": 70,
+                                        "critical": 90
+                                }
+                        },
+
+                        "sway/language": {
+                                "format": " {}",
+                                "min-length": 5,
+                                "on-click": "swaymsg 'input * xkb_switch_layout next'",
+                                "tooltip": false
+                        },
+
+                        "memory": {
+                                "interval": 5,
+                                "format": " {used:0.1f}G/{total:0.1f}G",
+                                "states": {
+                                        "warning": 70,
+                                        "critical": 90
+                                },
+                                "tooltip": false
+                        },
+
+                        "network": {
+                                "interval": 5,
+                                "format-wifi": " {essid} ({signalStrength}%)",
+                                "format-ethernet": " {ifname}",
+                                "format-disconnected": "No connection",
+                                "format-alt": " {ipaddr}/{cidr}",
+                                "tooltip": false
+                        },
+
+                        "sway/mode": {
+                                "format": "{}",
+                                "tooltip": false
+                        },
+
+                        "sway/window": {
+                                "format": "{}",
+                                "max-length": 30,
+                                "tooltip": false
+                        },
+
+                        "sway/workspaces": {
+                                "disable-scroll-wraparound": true,
+                                "smooth-scrolling-threshold": 4,
+                                "enable-bar-scroll": true,
+                                "format": "{name}"
+                        },
+
+                        "pulseaudio": {
+                                "format": "{icon} {volume}%",
+                                "format-bluetooth": "{icon} {volume}%",
+                                "format-muted": "",
+                                "format-icons": {
+                                        "headphone": "",
+                                        "hands-free": "",
+                                        "headset": "",
+                                        "phone": "",
+                                        "portable": "",
+                                        "car": "",
+                                        "default": ["", ""]
+                                },
+                                "scroll-step": 1,
+                                "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
+                                "tooltip": false
+                        },
+
+                        "temperature": {
+                                "critical-threshold": 90,
+                                "interval": 5,
+                                "format": "{icon} {temperatureC}°",
+                                "format-icons": [
+                                        "",
+                                        "",
+                                        "",
+                                        "",
+                                        ""
+                                ],
+                                "tooltip": false
+                        },
+
+                        "tray": {
+                                "icon-size": 18
+                                //"spacing": 10
+                        },
+
+                        "custom/arrow1": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow2": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow3": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow4": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow5": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow6": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow7": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow8": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow9": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow10": {
+                                "format": "",
+                                "tooltip": false
+                        }
+  }
+// vi:ft=jsonc
diff --git a/dotfiles/waybar/config~ b/dotfiles/waybar/config~
new file mode 100644
index 0000000..e26083d
--- /dev/null
+++ b/dotfiles/waybar/config~
@@ -0,0 +1,213 @@
+{
+   "layer": "top",
+   "position": "top",
+
+                      "modules-left": [
+                      "sway/mode",
+                      "sway/workspaces",
+                      "custom/arrow10",
+                      "sway/window"
+                      ],
+
+                      "modules-right": [
+                      "custom/arrow9",
+                      "pulseaudio",
+                      "custom/arrow8",
+                      "network",
+                      "custom/arrow7",
+                      "memory",
+                      "custom/arrow6",
+                      "cpu",
+                      "custom/arrow5",
+                      "temperature",
+                      "custom/arrow4",
+                      "battery",
+                      "custom/arrow3",
+                      "sway/language",
+                      "custom/arrow2",
+                      "tray",
+                      "clock#date",
+                      "custom/arrow1",
+                      "clock#time"
+                      ],
+
+                      // Modules
+
+                      "battery": {
+                               "interval": 10,
+                               "states": {
+                                         "warning": 30,
+                                         "critical": 15
+                                         },
+                                "format-time": "{H}:{M:02}",
+                                "format": "{icon} {capacity}% ({time})",
+                                "format-charging": " {capacity}% ({time})",
+                                "format-charging-full": " {capacity}%",
+                                "format-full": "{icon} {capacity}%",
+                                "format-alt": "{icon} {power}W",
+                                "format-icons": [
+                                        "",
+                                        "",
+                                        "",
+                                        "",
+                                        ""
+                                ],
+                                "tooltip": false
+                        },
+
+                        "clock#time": {
+                                "interval": 10,
+                                "format": "{:%H:%M}",
+                                "tooltip": false
+                        },
+
+                        "clock#date": {
+                                "interval": 20,
+                                "format": "{:%e %b %Y}",
+                                "tooltip": false
+                                //"tooltip-format": "{:%e %B %Y}"
+                        },
+
+                        "cpu": {
+                                "interval": 5,
+                                "tooltip": false,
+                                "format": " {usage}%",
+                                "format-alt": " {load}",
+                                "states": {
+                                        "warning": 70,
+                                        "critical": 90
+                                }
+                        },
+
+                        "sway/language": {
+                                "format": " {}",
+                                "min-length": 5,
+                                "on-click": "swaymsg 'input * xkb_switch_layout next'",
+                                "tooltip": false
+                        },
+
+                        "memory": {
+                                "interval": 5,
+                                "format": " {used:0.1f}G/{total:0.1f}G",
+                                "states": {
+                                        "warning": 70,
+                                        "critical": 90
+                                },
+                                "tooltip": false
+                        },
+
+                        "network": {
+                                "interval": 5,
+                                "format-wifi": " {essid} ({signalStrength}%)",
+                                "format-ethernet": " {ifname}",
+                                "format-disconnected": "No connection",
+                                "format-alt": " {ipaddr}/{cidr}",
+                                "tooltip": false
+                        },
+
+                        "sway/mode": {
+                                "format": "{}",
+                                "tooltip": false
+                        },
+
+                        "sway/window": {
+                                "format": "{}",
+                                "max-length": 30,
+                                "tooltip": false
+                        },
+
+                        "sway/workspaces": {
+                                "disable-scroll-wraparound": true,
+                                "smooth-scrolling-threshold": 4,
+                                "enable-bar-scroll": true,
+                                "format": "{name}"
+                        },
+
+                        "pulseaudio": {
+                                "format": "{icon} {volume}%",
+                                "format-bluetooth": "{icon} {volume}%",
+                                "format-muted": "",
+                                "format-icons": {
+                                        "headphone": "",
+                                        "hands-free": "",
+                                        "headset": "",
+                                        "phone": "",
+                                        "portable": "",
+                                        "car": "",
+                                        "default": ["", ""]
+                                },
+                                "scroll-step": 1,
+                                "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
+                                "tooltip": false
+                        },
+
+                        "temperature": {
+                                "critical-threshold": 90,
+                                "interval": 5,
+                                "format": "{icon} {temperatureC}°",
+                                "format-icons": [
+                                        "",
+                                        "",
+                                        "",
+                                        "",
+                                        ""
+                                ],
+                                "tooltip": false
+                        },
+
+                        "tray": {
+                                "icon-size": 18
+                                //"spacing": 10
+                        },
+
+                        "custom/arrow1": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow2": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow3": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow4": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow5": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow6": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow7": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow8": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow9": {
+                                "format": "",
+                                "tooltip": false
+                        },
+
+                        "custom/arrow10": {
+                                "format": "",
+                                "tooltip": false
+                        }
+  }
+// vi:ft=jsonc
diff --git a/dotfiles/waybar/style.css b/dotfiles/waybar/style.css
new file mode 100644
index 0000000..01c85c0
--- /dev/null
+++ b/dotfiles/waybar/style.css
@@ -0,0 +1,265 @@
+/* Keyframes */
+
+@keyframes blink-critical {
+    to {
+        /*color: @white;*/
+        background-color: @critical;
+    }
+}
+
+
+/* Styles */
+
+/* Colors (gruvbox) */
+@define-color black	#282828;
+@define-color red	#cc241d;
+@define-color green	#98971a;
+@define-color yellow	#d79921;
+@define-color blue	#458588;
+@define-color purple	#b16286;
+@define-color aqua	#689d6a;
+@define-color gray	#a89984;
+@define-color brgray	#928374;
+@define-color brred	#fb4934;
+@define-color brgreen	#b8bb26;
+@define-color bryellow	#fabd2f;
+@define-color brblue	#83a598;
+@define-color brpurple	#d3869b;
+@define-color braqua	#8ec07c;
+@define-color white	#ebdbb2;
+@define-color bg2	#504945;
+
+
+@define-color warning 	@bryellow;
+@define-color critical	@red;
+@define-color mode	@black;
+@define-color unfocused	@bg2;
+@define-color focused	@braqua;
+@define-color inactive	@purple;
+@define-color sound	@brpurple;
+@define-color network	@purple;
+@define-color memory	@braqua;
+@define-color cpu	@green;
+@define-color temp	@brgreen;
+@define-color layout	@bryellow;
+@define-color battery	@aqua;
+@define-color date	@black;
+@define-color time	@white;
+
+/* Reset all styles */
+* {
+    border: none;
+    border-radius: 0;
+    min-height: 0;
+    margin: 0;
+    padding: 0;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+}
+
+/* The whole bar */
+#waybar {
+    background: rgba(40, 40, 40, 0.8784313725); /* #282828e0 */
+    color: @white;
+    font-family: FiraCode Nerd Font Mono, Retina;
+    font-size: 12pt;
+    /*font-weight: bold;*/
+}
+
+/* Each module */
+#battery,
+#clock,
+#cpu,
+#language,
+#memory,
+#mode,
+#network,
+#pulseaudio,
+#temperature,
+#tray,
+#backlight,
+#idle_inhibitor,
+#disk,
+#user,
+#mpris {
+    padding-left: 8pt;
+    padding-right: 8pt;
+}
+
+/* Each critical module */
+#mode,
+#memory.critical,
+#cpu.critical,
+#temperature.critical,
+#battery.critical.discharging {
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+    animation-direction: alternate;
+    animation-name: blink-critical;
+    animation-duration: 1s;
+}
+
+/* Each warning */
+#network.disconnected,
+#memory.warning,
+#cpu.warning,
+#temperature.warning,
+#battery.warning.discharging {
+    color: @warning;
+}
+
+/* And now modules themselves in their respective order */
+
+/* Current sway mode (resize etc) */
+#mode {
+    color: @white;
+    background: @mode;
+}
+
+/* Workspaces stuff */
+#workspaces button {
+    /*font-weight: bold;*/
+    padding-left: 2pt;
+    padding-right: 2pt;
+    color: @white;
+    background: @unfocused;
+}
+
+/* Inactive (on unfocused output) */
+#workspaces button.visible {
+    color: @white;
+    background: @inactive;
+}
+
+/* Active (on focused output) */
+#workspaces button.focused {
+    color: @black;
+    background: @focused;
+}
+
+/* Contains an urgent window */
+#workspaces button.urgent {
+    color: @black;
+    background: @warning;
+}
+
+/* Style when cursor is on the button */
+#workspaces button:hover {
+    background: @black;
+    color: @white;
+}
+
+#window {
+    margin-right: 35pt;
+    margin-left: 35pt;
+}
+
+#pulseaudio {
+    background: @sound;
+    color: @black;
+}
+
+#network {
+    background: @network;
+    color: @white;
+}
+
+#memory {
+    background: @memory;
+    color: @black;
+}
+
+#cpu {
+    background: @cpu;
+    color: @white;
+}
+
+#temperature {
+    background: @temp;
+    color: @black;
+}
+
+#language {
+    background: @layout;
+    color: @black;
+}
+
+#battery {
+    background: @battery;
+    color: @white;
+}
+
+#tray {
+    background: @date;
+}
+
+#clock.date {
+    background: @date;
+    color: @white;
+}
+
+#clock.time {
+    background: @time;
+    color: @black;
+}
+
+#custom-arrow1 {
+    font-size: 11pt;
+    color: @time;
+    background: @date;
+}
+
+#custom-arrow2 {
+    font-size: 11pt;
+    color: @date;
+    background: @layout;
+}
+
+#custom-arrow3 {
+    font-size: 11pt;
+    color: @layout;
+    background: @battery;
+}
+
+#custom-arrow4 {
+    font-size: 11pt;
+    color: @battery;
+    background: @temp;
+}
+
+#custom-arrow5 {
+    font-size: 11pt;
+    color: @temp;
+    background: @cpu;
+}
+
+#custom-arrow6 {
+    font-size: 11pt;
+    color: @cpu;
+    background: @memory;
+}
+
+#custom-arrow7 {
+    font-size: 11pt;
+    color: @memory;
+    background: @network;
+}
+
+#custom-arrow8 {
+    font-size: 11pt;
+    color: @network;
+    background: @sound;
+}
+
+#custom-arrow9 {
+    font-size: 11pt;
+    color: @sound;
+    background: transparent;
+}
+
+#custom-arrow10 {
+    font-size: 11pt;
+    color: @unfocused;
+    background: transparent;
+}