diff --git a/home/alex/home.nix b/home/alex/home.nix index d856d60..128f794 100644 --- a/home/alex/home.nix +++ b/home/alex/home.nix @@ -58,7 +58,6 @@ scummvm # reading - xournalpp # pdf editor ]; }; diff --git a/home/alex/programs/emacs/doom/config.el b/home/alex/programs/emacs/doom/config.el index b1761ad..e53ac2e 100644 --- a/home/alex/programs/emacs/doom/config.el +++ b/home/alex/programs/emacs/doom/config.el @@ -56,17 +56,6 @@ (add-to-list 'lsp-file-watch-ignored-directories "[/\\\\]target\\'") ) -(defun set-frame-alpha (arg &optional active) - "Interactively set the transparency of the active frame" - (interactive "nEnter alpha value (1-100): \np") - (let* ((elt (assoc 'alpha default-frame-alist)) - (old (frame-parameter nil 'alpha)) - (new (cond ((atom old) `(,arg ,arg)) - ((eql 1 active) `(,arg ,(cadr old))) - (t `(,(car old) ,arg))))) - (if elt (setcdr elt new) (push `(alpha ,@new) default-frame-alist)) - (set-frame-parameter nil 'alpha new))) - (defun my/org-id-update-id-current-file () "Scan the current buffer for Org-ID locations and update them." (interactive) diff --git a/home/alex/programs/emacs/doom/init.el b/home/alex/programs/emacs/doom/init.el index 927777c..70f3b7c 100644 --- a/home/alex/programs/emacs/doom/init.el +++ b/home/alex/programs/emacs/doom/init.el @@ -156,7 +156,7 @@ (org +pandoc +present +gnuplot +noter) ; organize your plain life in plain text ;;php ; perl's insecure younger brother plantuml ; diagrams for confusing people more - (purescript +lsp) ; javascript, but functional + ;;purescript ; javascript, but functional (python +lsp +tree-sitter +pyenv) ; beautiful is better than ugly qt ; the 'cutest' gui framework ever (racket +lsp +xp) ; a DSL for DSLs diff --git a/home/alex/programs/xmonad/config.hs b/home/alex/programs/xmonad/config.hs index 8087dad..4e1c6ec 100644 --- a/home/alex/programs/xmonad/config.hs +++ b/home/alex/programs/xmonad/config.hs @@ -108,7 +108,7 @@ myConfig = , ("M-S-r", compileRestart True) , ("M-S-q", restart "xmonad" True) , ("M-C-s", unGrab *> spawn "scrot -s") - , ("M-S-s", sendMessage Docks.ToggleStruts) + , ("M-b", sendMessage Docks.ToggleStruts) , ("M-f", sendMessage (Toggle "Full")) , ("M-p", spawn appLauncher) , ("M-i", spawn passLauncher) @@ -124,21 +124,16 @@ myConfig = ("M-s M-t", namedScratchpadAction scratchpads "shell") , ("M-s M-s", namedScratchpadAction scratchpads "notes") , -- backlight control + ("", spawn "xbacklight -dec 5") , ("", spawn "xbacklight -inc 5") , ("", spawn "xbacklight -dec 5") , ("", spawn "xbacklight -inc 5") - , -- transparency - ("S-", spawn "picom-trans -c -5") - , ("S-", spawn "picom-trans -c +5") - , ("M-S-d", spawn "picom-trans -c +5") - , ("M-S-b", spawn "picom-trans -c -5") , -- volume control + ("", changeVolume ToggleVolume) , ("", changeVolume $ LowerVolume 5) , ("", changeVolume $ RaiseVolume 5) - , ("M-d", changeVolume $ RaiseVolume 5) - , ("M-b", changeVolume $ LowerVolume 5) , ("M-a", sendMessage Balance) , ("M-S-a", sendMessage Equalize) , ("M-o", sendMessage Rotate) diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix index 6e5609b..71b89de 100644 --- a/hosts/dregil/default.nix +++ b/hosts/dregil/default.nix @@ -1,26 +1,11 @@ -{ - lib, - config, - pkgs, - inputs, - ... -}: -{ +{ lib, config, pkgs, inputs, ... }: { imports = [ - ( - { ... }: - { - nixpkgs = { - config.allowUnfree = true; - }; - } - ) + ({ ... }: { nixpkgs = { config.allowUnfree = true; }; }) ../../modules/security.nix ../../modules/common-system.nix ./configuration.nix inputs.home-manager.nixosModules.home-manager ../../home/anne/default.nix ../../home/alex/default.nix - ../../modules/podman ]; } diff --git a/modules/podman/default.nix b/modules/podman/default.nix deleted file mode 100644 index 81f4627..0000000 --- a/modules/podman/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ pkgs, ... }: -{ - # Enable common container config files in /etc/containers - virtualisation.containers.enable = true; - virtualisation = { - podman = { - enable = true; - - # Create a `docker` alias for podman, to use it as a drop-in replacement - dockerCompat = true; - - # Required for containers under podman-compose to be able to talk to each other. - defaultNetwork.settings.dns_enabled = true; - }; - }; - - # Useful other development tools - environment.systemPackages = with pkgs; [ - dive # look into docker image layers - podman-tui # status of containers in the terminal - # docker-compose # start group of containers for dev - podman-compose # start group of containers for dev - ]; -}