diff options
| -rw-r--r-- | joeyconfig.hs | 4 | ||||
| -rw-r--r-- | src/Propellor/Property/SiteSpecific/JoeySites.hs | 44 |
2 files changed, 46 insertions, 2 deletions
diff --git a/joeyconfig.hs b/joeyconfig.hs index f54bd691..fb26ce6c 100644 --- a/joeyconfig.hs +++ b/joeyconfig.hs @@ -86,13 +86,13 @@ darkstar = host "darkstar.kitenet.net" $ props & osDebian Unstable X86_64 & ipv6 "2001:4830:1600:187::2" & Hostname.sane - - & User.nuked (User "nosuchuser") User.YesReallyDeleteHome + & Apt.serviceInstalledRunning "swapspace" & JoeySites.dkimMilter & JoeySites.postfixSaslPasswordClient -- & JoeySites.alarmClock "*-*-* 7:30" (User "joey") -- "/usr/bin/timeout 45m /home/joey/bin/goodmorning" + & JoeySites.laptopSoftware & Ssh.userKeys (User "joey") hostContext [ (SshRsa, "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC1YoyHxZwG5Eg0yiMTJLSWJ/+dMM6zZkZiR4JJ0iUfP+tT2bm/lxYompbSqBeiCq+PYcSC67mALxp1vfmdOV//LWlbXfotpxtyxbdTcQbHhdz4num9rJQz1tjsOsxTEheX5jKirFNC5OiKhqwIuNydKWDS9qHGqsKcZQ8p+n1g9Lr3nJVGY7eRRXzw/HopTpwmGmAmb9IXY6DC2k91KReRZAlOrk0287LaK3eCe1z0bu7LYzqqS+w99iXZ/Qs0m9OqAPnHZjWQQ0fN4xn5JQpZSJ7sqO38TBAimM+IHPmy2FTNVVn9zGM+vN1O2xr3l796QmaUG1+XLL0shfR/OZbb joey@darkstar") ] diff --git a/src/Propellor/Property/SiteSpecific/JoeySites.hs b/src/Propellor/Property/SiteSpecific/JoeySites.hs index 6965af76..03e9c3f7 100644 --- a/src/Propellor/Property/SiteSpecific/JoeySites.hs +++ b/src/Propellor/Property/SiteSpecific/JoeySites.hs @@ -1033,3 +1033,47 @@ ipmasq intif = File.hasContent ifupscript ifupscript = "/etc/network/if-up.d/ipmasq" pppupscript = "/etc/ppp/ip-up.d/ipmasq" scriptmode f = f `File.mode` combineModes (readModes ++ executeModes) + +laptopSoftware :: Property DebianLike +laptopSoftware = Apt.installed + [ "procmeter3", "xfce4", "procmeter3", "unclutter" + , "mplayer", "fbreader", "firefox", "chromium" + , "libdatetime-event-sunrise-perl", "libtime-duration-perl" + , "iftop", "network-manager", "gtk-redshift", "powertop" + , "gimp", "gthumb", "inkscape", "sozi", "xzgv", "hugin" + , "mpc", "mpd", "ncmpc", "sonata", "mpdtoys" + , "bsdgames", "nethack" + , "xmonad", "libghc-xmonad-dev", "libghc-xmonad-contrib-dev" + , "ttf-bitstream-vera" + , "mairix", "offlineimap", "mutt" + , "nmap" + , "udevil", "pmount" + , "arbtt", "hledger" + , "apache2", "ikiwiki", "libhighlight-perl" + , "pal" + , "yeahconsole", "xkbset", "xinput" + , "assword", "pumpa", "vorbis-tools" + , "xul-ext-ublock-origin", "xul-ext-pdf.js", "xul-ext-status4evar" + , "vim-syntastic", "vim-fugitive" + , "adb", "gthumb" + , "w3m", "sm", "weechat" + , "borgbackup" + ] + `requires` baseSoftware + `requires` devSoftware + +baseSoftware :: Property DebianLike +baseSoftware = Apt.installed + [ "bash", "bash-completion", "vim", "screen", "less", "moreutils" + , "git", "mr", "etckeeper", "git-annex", "ssh", "vim-vimoutliner" + ] + +devSoftware :: Property DebianLike +devSoftware = Apt.installed + [ "build-essential", "debhelper", "devscripts" + , "ghc", "cabal-install", "haskell-stack" + , "hothasktags", "hdevtools", "hlint" + , "gdb", "dpkg-repack", "lintian" + , "pristine-tar", "github-backup" + , "kvm" + ] |